site: fix condition

we don't know ceph_stable_release before executing the role so at least
we need to run ceph-defaults and ceph-docker-common or
ceph-common.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1486062
Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/site-docker.yml.sample b/site-docker.yml.sample
index f01b29372936e97535fda316d8a4b4cb9fe58a2f..d10544cf8ac4747d982d03c6353fbb4e803581d6 100644 (file)
--- a/site-docker.yml.sample
+++ b/site-docker.yml.sample
@@ -37,8 +37,8 @@
   become: True
   gather_facts: false
   roles:
-    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-    - { role: ceph-docker-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - ceph-defaults
+    - ceph-docker-common
     - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
     - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
 

diff --git a/site.yml.sample b/site.yml.sample
index 2e46bbacbe8331994ceb8485d2a15f10b017a7b8..286701a1081de17fd51e3fcfd12c13fa381461be 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -65,8 +65,8 @@
   gather_facts: false
   become: True
   roles:
-    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
-    - { role: ceph-common, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
+    - ceph-defaults
+    - ceph-common
     - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
     - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }
 
@@ -146,8 +146,8 @@
   gather_facts: false
   become: True
   roles:
-    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
-    - { role: ceph-common, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
+    - ceph-defaults
+    - ceph-common
     - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
     - { role: ceph-iscsi-gw, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }