From eaa92f7e557f60525577f00d0ed2366d764f00ed Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 2 Jan 2019 14:30:27 +0100 Subject: [PATCH] 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 --- roles/ceph-common/tasks/main.yml | 2 ++ roles/ceph-facts/tasks/facts.yml | 5 ----- site.yml.sample | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml index 894bf8e8a..d975ed9d2 100644 --- 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 0eb1d3a2c..9e4162d26 100644 --- 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 9c3e1ecca..43e3b6724 100644 --- 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 -- 2.39.5