iscsigw: do not run common roles when deploying jewel

Let's not deploy common roles when iscsigw nodes for jewel deployment.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/site-docker.yml.sample b/site-docker.yml.sample
index 5a2336986d084ca70bc14f7ccfe9dbfec8eb8fb5..a11eee051e11fc009470b13016933dc94d4324c8 100644 (file)
--- a/site-docker.yml.sample
+++ b/site-docker.yml.sample
@@ -340,7 +340,7 @@
             start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
   roles:
     - { role: ceph-defaults, tags: ['ceph_update_config'] }
-    - ceph-docker-common
+    - { role: ceph-docker-common, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }
     - { role: ceph-config, tags: ['ceph_update_config'], when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }
     - { role: ceph-iscsi-gw, when: "ceph_release_num[ceph_release] >= ceph_release_num.luminous" }
   post_tasks:

diff --git a/site.yml.sample b/site.yml.sample
index a8a4912c63487136d4f1c4447549d7f94791cabc..fd4929724744ca03c2ef7df69e01b05247a31c84 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -369,6 +369,8 @@
     - role: ceph-defaults
       tags: ['ceph_update_config']
     - role: ceph-common
+      when:
+        - ceph_release_num[ceph_release] >= ceph_release_num.luminous
     - role: ceph-config
       tags: ['ceph_update_config']
       when: