From af17e0dfbb1d0154481091f4af83aa7e95e761b9 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 22 Jan 2019 14:25:45 +0100 Subject: [PATCH] override ceph_release with ceph_stable_release when `ceph_origin` is set to `'repository'` and `ceph_repository` to `'community'` we need to ensure `ceph_release` reflect `ceph_stable_release`. 4a3f180f9d29d5a31468ebb3d1c5f31a53a93960 simply removed the override while it should just have to be run only when the condition mentioned above is satisfied. Signed-off-by: Guillaume Abrioux (cherry picked from commit 0bfefdd5bc06b4f1dd03d9060b0a38a6f447b207) --- roles/ceph-common/tasks/main.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml index d975ed9d2..1c2e3d925 100644 --- a/roles/ceph-common/tasks/main.yml +++ b/roles/ceph-common/tasks/main.yml @@ -43,6 +43,14 @@ tags: - always +- name: set_fact ceph_release - override ceph_release with ceph_stable_release + set_fact: + ceph_release: "{{ ceph_stable_release }}" + when: + - ceph_origin == 'repository' + tags: + - always + - name: include facts_mon_fsid.yml include_tasks: facts_mon_fsid.yml run_once: true