Merge branch '536-install-local-storage-before-flux' into 'master'

Resolve "Install local-storage before flux"

Closes #536

See merge request openappstack/openappstack!243

ansible/roles/apps/files/local-storage.yaml

+../../../../flux/local-storage.yaml
\ No newline at end of file

ansible/roles/apps/tasks/flux.yml

 ---
+- name: Install helm-operator
+  tags:
+    - flux
+  # Commented version of below shell command:
+  # helm upgrade
+  #   # Install a new release if it doesn't yet exist.
+  #   --install
+  #   --repo "https://charts.fluxcd.io"
+  #   --namespace oas
+  #   --version 0.3.0
+  #   --set createCRD=true
+  #   # Reconcile actual helm releases with HelmRelease objects with this
+  #   # interval.
+  #   --set chartsSyncInterval=20m
+  #   # Update HelmRelease objects' status with this interval.
+  #   --set statusUpdateInterval=30s
+  #   # Helm release name
+  #   helm-operator
+  #   # Chart name
+  #   helm-operator
+  shell: helm upgrade --install --repo "https://charts.fluxcd.io" --namespace oas --version 0.3.0 --set createCRD=true --set chartsSyncInterval=20m --set statusUpdateInterval=30s helm-operator helm-operator
 
+- name: Create Kubernetes secret with local-storage settings
+  tags:
+    - config
+    - flux
+    - local-storage
+  vars:
+    flux:
+      name: "local-storage-settings"
+      namespace: "oas"
+  include_tasks:
+    file: flux_secret.yml
+    apply:
+      tags:
+        - config
+        - flux
+        - local-storage
+
+- name: Create local-storage HelmResource
+  tags:
+    - config
+    - flux
+    - local-storage
+  k8s:
+    state: present
+    resource_definition: "{{ lookup('file', 'local-storage.yaml') | from_yaml }}"
 
 - name: Install flux
   tags:
@@ -40,28 +86,6 @@
   #   flux
   shell: helm upgrade --install --repo "https://charts.fluxcd.io" --namespace oas --version 0.16.0 --set git.url="{{ git_url }}" --set git.branch="{{ git_branch }}" --set git.path="{{ git_path }}" --set git.readonly=true --set registry.excludeImage='*' --set sync.state="secret" --set syncGarbageCollection.enabled=true --set git.pollInterval=1h flux flux
 
-- name: Install helm-operator
-  tags:
-    - flux
-  # Commented version of below shell command:
-  # helm upgrade
-  #   # Install a new release if it doesn't yet exist.
-  #   --install
-  #   --repo "https://charts.fluxcd.io"
-  #   --namespace oas
-  #   --version 0.3.0
-  #   --set createCRD=true
-  #   # Reconcile actual helm releases with HelmRelease objects with this
-  #   # interval.
-  #   --set chartsSyncInterval=20m
-  #   # Update HelmRelease objects' status with this interval.
-  #   --set statusUpdateInterval=30s
-  #   # Helm release name
-  #   helm-operator
-  #   # Chart name
-  #   helm-operator
-  shell: helm upgrade --install --repo "https://charts.fluxcd.io" --namespace oas --version 0.3.0 --set createCRD=true --set chartsSyncInterval=20m --set statusUpdateInterval=30s helm-operator helm-operator
-
 - name: Install fluxctl via snap
   tags:
     - flux

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

----
-- name: Create Kubernetes secret with local-storage settings
-  tags:
-    - config
-    - flux
-    - local-storage
-  vars:
-    flux:
-      name: "local-storage-settings"
-      namespace: "oas"
-  include_tasks:
-    file: flux_secret.yml
-    apply:
-      tags:
-        - config
-        - flux
-        - local-storage

ansible/roles/apps/tasks/main.yml

 ---
 
-- name: Install flux
+- name: Install helm operator, local-storage and flux
   import_tasks: flux.yml
 
-- name: Perform tasks necessary for local-storage
-  import_tasks: local-storage.yml
-
 - name: Tasks pertaining to cert-manager
   import_tasks: cert-manager.yml