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
(cherry picked from commit e9188cd202663656a773eb9e2276c6dbc0684599)
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 894bf8e8a48a15b47979fadfc12581438ba23e21..d975ed9d2b77932ea78b86891d36b4d0ac148ab8 100644 (file)
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -38,6 +38,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 0eb1d3a2c2cd5d2ed9b43971a58430a6232e1f59..9e4162d2662f571ddf594009dbc9515ab0ee0a2c 100644 (file)
--- a/roles/ceph-facts/tasks/facts.yml
+++ b/roles/ceph-facts/tasks/facts.yml
@@ -84,11 +84,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
   local_action:
     module: shell

diff --git a/site.yml.sample b/site.yml.sample
index 9c3e1ecca230a3db186883e3794997f4bf4058b4..43e3b6724fd5f5ee55ec87bce18eac23e9be5e7b 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -432,4 +432,4 @@
         msg: "{{ ceph_status.stdout_lines }}"
       delegate_to: "{{ groups[mon_group_name][0] }}"
       run_once: true
-      when: not ceph_status.failed
\ No newline at end of file
+      when: not ceph_status.failed