From 616b6bae5cf4351fe4d7b6fffd73e7c39b8e92bb Mon Sep 17 00:00:00 2001
From: richard <r_morgan@sympatico.ca>
Date: Sat, 1 Jan 2022 10:11:38 -0500
Subject: [PATCH] mount gitea and vmshares gluster volumes on kube host

---
 ansible-5/roles/glusterfs/defaults/main.yaml      | 14 +++++++-------
 ansible-5/roles/glusterfs/tasks/remove_volume.yml |  4 ++++
 ansible-5/roles/prod.k3s/defaults/main.yml        |  6 +++++-
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/ansible-5/roles/glusterfs/defaults/main.yaml b/ansible-5/roles/glusterfs/defaults/main.yaml
index f2f887a..0520584 100644
--- a/ansible-5/roles/glusterfs/defaults/main.yaml
+++ b/ansible-5/roles/glusterfs/defaults/main.yaml
@@ -15,12 +15,12 @@ volumes:
   brick_folder: brick
   # bricks found at "{{mounts.paths[gitea]}}/{{volumes.brick_folder}}"
   replicated:
-#    - name: gitea
+    - name: gitea
     - name: jenkins
-#    - name: vmshares
+    - name: vmshares
 #    - name: mariadb
 #    - name: plex
-#    - name: nextcloud
+#    - name: nextcloud2
 #    - name: prometheus
 #    - name: tmp
 
@@ -29,7 +29,7 @@ volumes:
 
   removed:
     - name: jenkins2
-    - name: nextcloud2
+    - name: nextcloud
     - name: postgres
 
 mounts:
@@ -44,10 +44,10 @@ mounts:
     postgres: /data/glusterfs/postgres/brick1 # dead
     prometheus: /data/glusterfs/prometheus/brick1
     tmp: /data/glusterfs/tmp/brick1
-    vmshare: /data/glusterfs/vmshares/brick1
+    vmshares: /data/glusterfs/vmshares/brick1
 
   cubox-i:
-    - name: vmshare
+    - name: vmshares
       status: mounted
       src: "UUID=d1b005e1-294f-4588-b9a6-21b72f7e3e0f"
     - name: gitea
@@ -76,7 +76,7 @@ mounts:
       src: "UUID=ced31b8e-8404-4bff-b428-6411c54451a4"
 
   home:
-    - name: vmshare
+    - name: vmshares
       status: mounted
       src: "UUID=1ee11dc5-0b55-47bd-a92c-e644175a8ba9"
     - name: gitea
diff --git a/ansible-5/roles/glusterfs/tasks/remove_volume.yml b/ansible-5/roles/glusterfs/tasks/remove_volume.yml
index 8874d40..09072b3 100644
--- a/ansible-5/roles/glusterfs/tasks/remove_volume.yml
+++ b/ansible-5/roles/glusterfs/tasks/remove_volume.yml
@@ -5,6 +5,10 @@
     path: "{{mounts.paths[item.name]}}/{{volumes.brick_folder}}/.glusterfs"
   register: gluster_volume_config
 
+- name: "Old gluster volume {{item.name}} needs to be removed"
+  debug:
+    var: gluster_volume_config.stat.exists
+
 - name: remove old gluster volumes
   block:
     - name: remove volume
diff --git a/ansible-5/roles/prod.k3s/defaults/main.yml b/ansible-5/roles/prod.k3s/defaults/main.yml
index 2f0ca37..0bb5fc5 100644
--- a/ansible-5/roles/prod.k3s/defaults/main.yml
+++ b/ansible-5/roles/prod.k3s/defaults/main.yml
@@ -8,4 +8,8 @@ fstab:
       state: mounted
     - name: gitea
       path: "/var/lib/gitea"
-      state: absent
+      state: present
+    - name: vmshares
+      path: "/opt/shared glusterfs"
+      state: present
+