ceph-default: rm useless condition

This condition is useless and it's also creating issues we don't see in
our CI. ceph_release is set by either ceph-common or ceph-docker-common
so let's keep it this way.

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

diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index a5fb948914f941c9f10dbda202fbfc2c459533bf..6f13233312795c9e33685c4ce19d3b3c1a2e5dcf 100644 (file)
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -39,6 +39,8 @@
   include_tasks: release-rhcs.yml
   when:
     - ceph_repository in ['rhcs', 'dev']
+      or
+      ceph_origin == 'distro'
   tags:
     - always
 

diff --git a/roles/ceph-facts/tasks/facts.yml b/roles/ceph-facts/tasks/facts.yml
index 08ef682b382e27d09b5f1c0fdbd321d2c5c5e312..eb703ce5a86a5a6e3f068c5d89bf5899d55b2f35 100644 (file)
--- a/roles/ceph-facts/tasks/facts.yml
+++ b/roles/ceph-facts/tasks/facts.yml
@@ -98,11 +98,6 @@
   when:
     - ceph_current_status.fsid is defined
 
-# Set ceph_release to ceph_stable by default
-- name: set_fact ceph_release ceph_stable_release
-  set_fact:
-    ceph_release: "{{ ceph_stable_release }}"
-
 - name: generate cluster fsid
   shell: python -c 'import uuid; print(str(uuid.uuid4()))' | tee {{ fetch_directory }}/ceph_cluster_uuid.conf
   args:

diff --git a/site.yml.sample b/site.yml.sample
index 43547e2855a819e3e3bb45d16c16c54db3b9119d..8122c7f672b06fd695be65ea1bd24fa950440224 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -458,8 +458,6 @@
         name: ceph-handler
     - import_role:
         name: ceph-common
-      when:
-        - ceph_release_num[ceph_release] >= ceph_release_num.luminous
     - import_role:
         name: ceph-config
       tags: ['ceph_update_config']