summaryrefslogtreecommitdiffstats
path: root/ansible
diff options
context:
space:
mode:
Diffstat (limited to 'ansible')
-rw-r--r--ansible/roles/application-install/tasks/install.yml2
-rw-r--r--ansible/roles/resource-data/tasks/nfs-upload.yml1
-rw-r--r--ansible/roles/resource-data/tasks/ssh-upload.yml1
3 files changed, 3 insertions, 1 deletions
diff --git a/ansible/roles/application-install/tasks/install.yml b/ansible/roles/application-install/tasks/install.yml
index 5246bf2f..c0be12eb 100644
--- a/ansible/roles/application-install/tasks/install.yml
+++ b/ansible/roles/application-install/tasks/install.yml
@@ -50,7 +50,7 @@
dest: "{{ app_data_path}}/override.yaml"
content: |
global:
- cacert:
+ cacert: |
{{ root_cert['content'] | b64decode | indent( width=4, indentfirst=False) }}
- name: Check for deploy plugin presence
diff --git a/ansible/roles/resource-data/tasks/nfs-upload.yml b/ansible/roles/resource-data/tasks/nfs-upload.yml
index 825486b6..4b5c18d1 100644
--- a/ansible/roles/resource-data/tasks/nfs-upload.yml
+++ b/ansible/roles/resource-data/tasks/nfs-upload.yml
@@ -22,6 +22,7 @@
dest: "{{ aux_data_path }}"
when: >
hostvars[groups.resources.0].aux_resources_filename is defined
+ and hostvars[groups.resources.0].aux_resources_filename is not none
and aux_data_path is defined and aux_data_path is not none
and hostvars[groups.resources.0].aux_file_presence.stat.exists
and not aux_resources_data_check.stat.exists
diff --git a/ansible/roles/resource-data/tasks/ssh-upload.yml b/ansible/roles/resource-data/tasks/ssh-upload.yml
index 8e04d5c0..bc7df37f 100644
--- a/ansible/roles/resource-data/tasks/ssh-upload.yml
+++ b/ansible/roles/resource-data/tasks/ssh-upload.yml
@@ -29,6 +29,7 @@
| tar -C "{{ aux_data_path }}" -xf -
when: >
hostvars[groups.resources.0].aux_resources_filename is defined
+ and hostvars[groups.resources.0].aux_resources_filename is not none
and aux_data_path is defined and aux_data_path is not none
and hostvars[groups.resources.0].aux_file_presence.stat.exists
and not aux_resources_data_check.stat.exists