Merge e5f4897 into 643be05

quipucords · Dec 22, 2017 · b8efd75 · b8efd75
2 parents 643be05 + e5f4897
commit b8efd75
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/roles/etc_release/tasks/main.yml b/roles/etc_release/tasks/main.yml
@@ -153,19 +153,27 @@
   when:
     - '"etc_release.name" in facts_to_collect'
     - 'redhat_release_found["stdout_lines"][0] == "Y"'
+    - '"stdout_lines" in redhat_release_found_release'
+    - 'redhat_release_found_release["stdout_lines"]|length > 0'
     - '"release" in redhat_release_found_release["stdout_lines"][0]'
 
 - name: gather etc_release.version based on redhat_release_found_release
   set_fact: etc_release_version="{{ redhat_release_found_release['stdout_lines'][0].split('release')[1] }}"
   when:
     - '"etc_release.version" in facts_to_collect'
     - 'redhat_release_found["stdout_lines"][0] == "Y"'
+    - '"stdout_lines" in redhat_release_found_release'
+    - 'redhat_release_found_release["stdout_lines"]|length > 0'
     - '"release" in redhat_release_found_release["stdout_lines"][0]'
 
 - name: gather etc_release.release based on redhat_release_found_release
   set_fact:
     etc_release_release: "{{ redhat_release_found_release['stdout_lines'][0] }}"
-  when: '"etc_release.release" in facts_to_collect and redhat_release_found["stdout_lines"][0] == "Y"'
+  when:
+    - '"etc_release.release" in facts_to_collect'
+    - 'redhat_release_found["stdout_lines"][0] == "Y"'
+    - '"stdout_lines" in redhat_release_found_release'
+    - 'redhat_release_found_release["stdout_lines"]|length > 0'
 
 - name: set rel for etc_release data based on etc_release_found
   raw: cat /etc/release