]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
Safer check 312/head
authorleseb <seb@redhat.com>
Fri, 3 Jul 2015 14:56:34 +0000 (16:56 +0200)
committerleseb <seb@redhat.com>
Fri, 3 Jul 2015 14:56:34 +0000 (16:56 +0200)
Without this, the subcription manager will run since the default value
for cdn is true...

Signed-off-by: leseb <seb@redhat.com>
roles/ceph-common/tasks/main.yml

index 0a00d38df2e903d9ce54e2f5e63d52d9d275dd28..23f2a063056248c826cf606cd31e5a599e43ee49 100644 (file)
@@ -8,10 +8,14 @@
   when: ceph_stable_ice
 
 - include: prerequisite_rh_storage_iso_install.yml
-  when: ceph_stable_rh_storage_iso_install
+  when:
+    ceph_stable_rh_storage and
+    ceph_stable_rh_storage_iso_install
 
 - include: prerequisite_rh_storage_cdn_install.yml
-  when: ceph_stable_rh_storage_cdn_install
+  when:
+    ceph_stable_rh_storage and
+    ceph_stable_rh_storage_cdn_install
 
 - include: install_on_redhat.yml
   when: ansible_os_family == 'RedHat'