Common: Do not install ceph-mgr packages on jewel

ceph-mgr tasks has to be skipped on jewel.

Fix: #1494

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

diff --git a/roles/ceph-common/tasks/installs/install_on_debian.yml b/roles/ceph-common/tasks/installs/install_on_debian.yml
index ae6dfda92c9972d2e34a2dab67c54849f4b4e21b..54b1ef2f40edaf33a29f13c1eedbe0a85818634c 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_debian.yml
+++ b/roles/ceph-common/tasks/installs/install_on_debian.yml
@@ -62,4 +62,6 @@
     pkg: ceph-mgr
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
     default_release: "{{ ceph_stable_release_uca | default(ansible_distribution_release) }}{{ '-backports' if ceph_origin == 'distro' and ceph_use_distro_backports else ''}}"
-  when: mgr_group_name in group_names
+  when:
+    - mgr_group_name in group_names
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel

diff --git a/roles/ceph-common/tasks/installs/install_on_redhat.yml b/roles/ceph-common/tasks/installs/install_on_redhat.yml
index 8a8d82a777e6044e9393d84eb0eb1e0da56435e3..e573a0b7cacac161e3b05c607bbedd1ee551c1bb 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_redhat.yml
+++ b/roles/ceph-common/tasks/installs/install_on_redhat.yml
@@ -147,4 +147,6 @@
   package:
     name: ceph-mgr
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when: mgr_group_name in group_names
+  when:
+    - mgr_group_name in group_names
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel

diff --git a/roles/ceph-common/tasks/installs/install_rh_storage_on_debian.yml b/roles/ceph-common/tasks/installs/install_rh_storage_on_debian.yml
index 9580c4c5843fde3714c8114f27d0cd63378c7b30..d90190e4b9974aa678e876eb6b17508c4fd90599 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_rh_storage_on_debian.yml
+++ b/roles/ceph-common/tasks/installs/install_rh_storage_on_debian.yml
@@ -95,4 +95,6 @@
   apt:
     pkg: ceph-mgr
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when: mgr_group_name in group_names
+  when:
+    - mgr_group_name in group_names
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel

diff --git a/roles/ceph-common/tasks/installs/install_rh_storage_on_redhat.yml b/roles/ceph-common/tasks/installs/install_rh_storage_on_redhat.yml
index b5a1984a6b5795eb9cb8c7fb41d1b4d40c648375..1362593639e492fc32b2bf12462bd59e0847aee3 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_rh_storage_on_redhat.yml
+++ b/roles/ceph-common/tasks/installs/install_rh_storage_on_redhat.yml
@@ -75,4 +75,6 @@
   package:
     name: ceph-mgr
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
-  when: mgr_group_name in group_names
+  when:
+    - mgr_group_name in group_names
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel

diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml
index 4995cc10046bfc8390147d10f3e59f26a1edc496..e39f2b6d4632ebabce51d88dd38c4924929431fa 100644 (file)
--- a/roles/ceph-mon/tasks/ceph_keys.yml
+++ b/roles/ceph-mon/tasks/ceph_keys.yml
@@ -52,6 +52,7 @@
     - cephx
     - groups.get(mgr_group_name, []) | length > 0
     - inventory_hostname == groups[mon_group_name]|last
+    - ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel
   with_items: "{{ groups.get(mgr_group_name, []) }}"
 
 - include: set_osd_pool_default_pg_num.yml

diff --git a/roles/ceph-mon/tasks/docker/main.yml b/roles/ceph-mon/tasks/docker/main.yml
index 0b0d9aae1de5595f923e398041fc2ac1456ff6f8..2c6658a36b733db2642fe0b81466b567571d8270 100644 (file)
--- a/roles/ceph-mon/tasks/docker/main.yml
+++ b/roles/ceph-mon/tasks/docker/main.yml
@@ -125,3 +125,4 @@
       - item.stat.exists == true
   when:
     - inventory_hostname == groups[mon_group_name]|last
+    - ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel

diff --git a/site-docker.yml.sample b/site-docker.yml.sample
index 4ba025fc7a4661abf2304382326e5b863fe7d8e1..3d8bfc64c28a41f2306e14dd14853dc1e62f6815 100644 (file)
--- a/site-docker.yml.sample
+++ b/site-docker.yml.sample
@@ -55,4 +55,4 @@
 - hosts: mgrs
   become: True
   roles:
-  - ceph-mgr
+    - { 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 b1806418a73540e453f8c579f7ec00f861f57ff7..ae60d09a796802d2a20061fbf357577b5273dac1 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -103,4 +103,4 @@
   gather_facts: false
   become: True
   roles:
-  - ceph-mgr
+    - { role: ceph-mgr, when: "ceph_release_num.{{ ceph_stable_release }} > ceph_release_num.jewel" }