summaryrefslogtreecommitdiffstats
path: root/ansible/roles/resource-data
diff options
context:
space:
mode:
authorMichal Ptacek <m.ptacek@partner.samsung.com>2019-02-14 07:47:59 +0000
committerMichal Ptacek <m.ptacek@partner.samsung.com>2019-02-14 16:05:51 +0000
commit173ad8e60667a9779bfe2b9908a2cf60bb757e10 (patch)
treebe7f9663982a4c3d1d001b33e82c223fe1f5abdd /ansible/roles/resource-data
parente056345e8136959616622fbdeadc45851521b830 (diff)
Conditional login update after aux_data_path set
After setting-up of default value for aux_data_path some of the conditional logic must be updated. Issue-ID: OOM-1659 Change-Id: I0472c2e848f9215186b8aa11557165f606cac9d4 Signed-off-by: Michal Ptacek <m.ptacek@partner.samsung.com>
Diffstat (limited to 'ansible/roles/resource-data')
-rw-r--r--ansible/roles/resource-data/tasks/nfs-upload.yml1
-rw-r--r--ansible/roles/resource-data/tasks/ssh-upload.yml1
2 files changed, 2 insertions, 0 deletions
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