Fix locations for cluster_data/ and secrets/

Now they end up in the right place:

   clusters/varac-oas
   clusters/varac-oas/settings.yml
   clusters/varac-oas/cluster_data
   clusters/varac-oas/cluster_data/kube_config_cluster.yml
   clusters/varac-oas/cluster_data/rke_cluster.yml
   clusters/varac-oas/cluster_data/rke.log
   clusters/varac-oas/cluster_data/helmfile.log
   clusters/varac-oas/secrets
   clusters/varac-oas/secrets/grafana_admin_password
   clusters/varac-oas/secrets/nextcloud_admin_password
   clusters/varac-oas/secrets/nextcloud_mariadb_password
   clusters/varac-oas/secrets/nextcloud_mariadb_root_password
   clusters/varac-oas/inventory.yml

ansible/group_vars/all/oas.yml

@@ -11,10 +11,10 @@ ansible_python_interpreter: "/usr/bin/env python3"
 # Nextcloud administrator password. If you do not change this value, it gets
 # generated and stored in `{{ secret_directory }}/nextcloud_admin_password`.
 # You can also choose your own password and fill it in here instead.
-nextcloud_password: "{{ lookup('password', '{{ cluster_dir }}/secrets/nextcloud_admin_password chars=ascii_letters') }}"
-nextcloud_mariadb_password: "{{ lookup('password', '{{ cluster_dir }}/secrets/nextcloud_mariadb_password chars=ascii_letters') }}"
-nextcloud_mariadb_root_password: "{{ lookup('password', '{{ cluster_dir }}/secrets/nextcloud_mariadb_root_password chars=ascii_letters') }}"
-grafana_admin_password: "{{ lookup('password', '{{ cluster_dir }}/secrets/grafana_admin_password chars=ascii_letters') }}"
+nextcloud_password: "{{ lookup('password', '../{{ cluster_dir }}/secrets/nextcloud_admin_password chars=ascii_letters') }}"
+nextcloud_mariadb_password: "{{ lookup('password', '../{{ cluster_dir }}/secrets/nextcloud_mariadb_password chars=ascii_letters') }}"
+nextcloud_mariadb_root_password: "{{ lookup('password', '../{{ cluster_dir }}/secrets/nextcloud_mariadb_root_password chars=ascii_letters') }}"
+grafana_admin_password: "{{ lookup('password', '../{{ cluster_dir }}/secrets/grafana_admin_password chars=ascii_letters') }}"
 
 # Kubernetes version
 kubernetes_version: "v1.14.3-rancher1-1"

ansible/roles/finalize/tasks/sync_cluster_data.yml

@@ -11,10 +11,10 @@
     flat: yes
   loop:
     - src: "{{ data_directory }}/rke/kube_config_cluster.yml"
-      dest: "{{ secret_directory }}/kube_config_cluster.yml"
+      dest: "../{{ cluster_dir }}/cluster_data/kube_config_cluster.yml"
     - src: "{{ log_directory }}/rke.log"
-      dest: cluster_data/rke.log
+      dest: "../{{ cluster_dir }}/cluster_data/rke.log"
     - src: "{{ data_directory }}/rke/cluster.yml"
-      dest: cluster_data/rke_cluster.yml
+      dest: "../{{ cluster_dir }}/cluster_data/rke_cluster.yml"
     - src: "{{ log_directory }}/helmfile.log"
-      dest: cluster_data/helmfile.log
+      dest: "../{{ cluster_dir }}/cluster_data/helmfile.log"