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>

diff --git a/ansible/roles/resource-data/tasks/nfs-upload.yml b/ansible/roles/resource-data/tasks/nfs-upload.yml
index 825486b..4b5c18d 100644 (file)
--- 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 8e04d5c..bc7df37 100644 (file)
--- 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