common: remove unusuable conditions

`ceph_release` isn't available at this step of the playbook because it
is set later based on the installed binaries.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1486062
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>

diff --git a/roles/ceph-common/tasks/installs/install_debian_packages.yml b/roles/ceph-common/tasks/installs/install_debian_packages.yml
index 702d92598380153b0882a617cd978820dfcbaecf..7092d29bbe504d6ad9b2d53dd70a133bfefbdd9b 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_debian_packages.yml
+++ b/roles/ceph-common/tasks/installs/install_debian_packages.yml
@@ -68,4 +68,3 @@
     default_release: "{{ ceph_stable_release_uca | default(omit) }}{{ ansible_distribution_release ~ '-backports' if ceph_origin == 'distro' and ceph_use_distro_backports else ''}}"
   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_debian_rhcs_packages.yml b/roles/ceph-common/tasks/installs/install_debian_rhcs_packages.yml
index 02a07102b9c03f520e981cea56171aa419e6016f..bcc444f930cc12305d0996a416ecc396b4fdc6d6 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_debian_rhcs_packages.yml
+++ b/roles/ceph-common/tasks/installs/install_debian_rhcs_packages.yml
@@ -77,4 +77,3 @@
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
   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_redhat_packages.yml b/roles/ceph-common/tasks/installs/install_redhat_packages.yml
index e76e011fdd4d38e60c14eeece2b0dd4430759882..ea12b07f4644baa7e4713a2922dc5151c3116d9b 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_redhat_packages.yml
+++ b/roles/ceph-common/tasks/installs/install_redhat_packages.yml
@@ -100,7 +100,6 @@
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
   when:
     - mgr_group_name in group_names
-    - ceph_release_num.{{ ceph_release }} > ceph_release_num.jewel
 
 - name: install redhat ceph iscsi package
   package:
@@ -112,4 +111,3 @@
     - targetcli
   when:
     - iscsi_gw_group_name in group_names
-    - ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous