From e9188cd202663656a773eb9e2276c6dbc0684599 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 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, 2 insertions(+), 7 deletions(-) diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml index a5fb94891..6f1323331 100644 --- 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 08ef682b3..eb703ce5a 100644 --- 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 43547e285..8122c7f67 100644 --- 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'] -- 2.39.5