site: always play ceph-defaults and ceph-docker-common

So we can later evaluate the conditions.
Also fix the variable, we are comparing ceph_release not
ceph_stable_release

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 6e3bcedf546a1f4c206e59c8b3a08b7227fbca8d..6f3aef10254db882083ef82ba03dd0c7352fdf53 100644 (file)
--- a/site-docker.yml.sample
+++ b/site-docker.yml.sample
@@ -39,8 +39,8 @@
   roles:
     - ceph-defaults
     - ceph-docker-common
-    - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel" }
-    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel" }
+    - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
+    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
 
 - hosts: osds
   become: True
@@ -73,10 +73,10 @@
   become: True
   gather_facts: false
   roles:
-    - { role: ceph-defaults, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
-    - { role: ceph-docker-common, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
-    - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
-    - { role: ceph-nfs, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
+    - ceph-defaults
+    - ceph-docker-common
+    - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
+    - { role: ceph-nfs, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
 
 - hosts: rbdmirrors
   become: True

diff --git a/site.yml.sample b/site.yml.sample
index 4ae0cc54f3fb709b52995e1e0978649b5d4910d1..be79b48007f3b7730b3c3b51d1e35e3197d3c7ab 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -67,8 +67,8 @@
   roles:
     - ceph-defaults
     - ceph-common
-    - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel" }
-    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel" }
+    - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
+    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
 
 - hosts: agents
   gather_facts: false
@@ -110,10 +110,10 @@
   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" }
-    - { role: ceph-config, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
-    - { role: ceph-nfs, when: "ceph_release_num.{{ ceph_stable_release }} >= ceph_release_num.luminous" }
+    - ceph-defaults
+    - ceph-common
+    - { role: ceph-config, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
+    - { role: ceph-nfs, when: "ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous" }
 
 - hosts: restapis
   gather_facts: false