Merge branch '514-use-custom-pvcs-for-nextcloud' into 'master'

Resolve "Use custom PVCs for nextcloud"

Closes #514

See merge request openappstack/openappstack!224

ansible/roles/apps/tasks/cert-manager.yml

@@ -54,4 +54,10 @@
     flux:
       name: "cert-manager-settings"
       namespace: "oas"
-  include_tasks: flux_secret.yml
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - cert-manager

ansible/roles/apps/tasks/local-storage.yml

@@ -8,4 +8,10 @@
     flux:
       name: "local-storage-settings"
       namespace: "oas"
-  include_tasks: flux_secret.yml
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - local-storage

ansible/roles/apps/tasks/nextcloud.yml

@@ -7,7 +7,13 @@
   vars:
     flux:
       name: "nextcloud-settings"
-  include_tasks: flux_secret.yml
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - nextcloud
 
 - name: Create persistent volumes for nextcloud data and metadata
   tags:
@@ -19,9 +25,19 @@
       name: "nextcloud-{{ item.name }}"
       namespace: "oas-apps"
       size: "{{ item.size }}"
-  include_tasks: pvc.yml
+  include_tasks:
+    file: pvc.yml
+    apply:
+      tags:
+        - config
+        - nextcloud
+        - storage
   with_items:
     - name: "files"
       size: 2Gi
     - name: "mariadb"
       size: 512Mi
+    - name: "rabbitmq"
+      size: 8Gi
+    - name: "redis"
+      size: 8Gi

ansible/roles/apps/tasks/nginx.yml

@@ -9,4 +9,10 @@
     flux:
       name: "ingress-settings"
       namespace: "oas"
-  include_tasks: flux_secret.yml
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - nginx

ansible/roles/apps/tasks/prometheus.yml

@@ -40,4 +40,11 @@
     flux:
       name: "monitoring-settings"
       namespace: "oas"
-  include_tasks: flux_secret.yml
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - monitoring
+        - prometheus

ansible/roles/apps/tasks/pvc.yml

 ---
 - name: Create Persistent Volume Claim for application
-  tags:
-    - storage
   k8s:
     state: present
     definition:

ansible/roles/apps/tasks/rocketchat.yml

@@ -8,4 +8,10 @@
   vars:
     flux:
       name: "rocketchat-settings"
-  include_tasks: flux_secret.yml
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - rocketchat

ansible/roles/apps/tasks/single-sign-on.yml

@@ -9,4 +9,10 @@
     flux:
       name: "single-sign-on-settings"
       namespace: "oas"
-  include_tasks: flux_secret.yml
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - single-sign-on

ansible/roles/apps/tasks/wordpress.yml

@@ -7,7 +7,14 @@
   vars:
     flux:
       name: "wordpress-settings"
-  include_tasks: flux_secret.yml
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - wordpress
+
 
 - name: Create persistent volumes for wordpress data and metadata
   tags:
@@ -19,7 +26,13 @@
       name: "wordpress-{{ item.name }}"
       namespace: "oas-apps"
       size: "{{ item.size }}"
-  include_tasks: pvc.yml
+  include_tasks:
+    file: pvc.yml
+    apply:
+      tags:
+        - config
+        - wordpress
+        - storage
   with_items:
     - name: "files"
       size: 2Gi

ansible/roles/apps/templates/nextcloud-settings.yaml

@@ -90,6 +90,12 @@ postgresql:
 rabbitmq:
   rabbitmq:
     password: "{{ onlyoffice_rabbitmq_password }}"
+  persistence:
+    existingClaim: "nextcloud-rabbitmq"
+
+redis:
+  persistence:
+    existingClaim: "nextcloud-redis"
 
 sociallogin:
   server_name: "sso.{{ domain }}"