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/tasks/installs/install_on_debian.yml b/tasks/installs/install_on_debian.yml
index ae6dfda92c9972d2e34a2dab67c54849f4b4e21b..54b1ef2f40edaf33a29f13c1eedbe0a85818634c 100644 (file)
--- a/tasks/installs/install_on_debian.yml
+++ b/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/tasks/installs/install_on_redhat.yml b/tasks/installs/install_on_redhat.yml
index 8a8d82a777e6044e9393d84eb0eb1e0da56435e3..e573a0b7cacac161e3b05c607bbedd1ee551c1bb 100644 (file)
--- a/tasks/installs/install_on_redhat.yml
+++ b/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/tasks/installs/install_rh_storage_on_debian.yml b/tasks/installs/install_rh_storage_on_debian.yml
index 9580c4c5843fde3714c8114f27d0cd63378c7b30..d90190e4b9974aa678e876eb6b17508c4fd90599 100644 (file)
--- a/tasks/installs/install_rh_storage_on_debian.yml
+++ b/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/tasks/installs/install_rh_storage_on_redhat.yml b/tasks/installs/install_rh_storage_on_redhat.yml
index b5a1984a6b5795eb9cb8c7fb41d1b4d40c648375..1362593639e492fc32b2bf12462bd59e0847aee3 100644 (file)
--- a/tasks/installs/install_rh_storage_on_redhat.yml
+++ b/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