]> git.apps.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
override ceph_release with ceph_stable_release
authorGuillaume Abrioux <gabrioux@redhat.com>
Tue, 22 Jan 2019 13:25:45 +0000 (14:25 +0100)
committermergify[bot] <mergify[bot]@users.noreply.github.com>
Thu, 24 Jan 2019 14:18:34 +0000 (14:18 +0000)
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 <gabrioux@redhat.com>
(cherry picked from commit 0bfefdd5bc06b4f1dd03d9060b0a38a6f447b207)

roles/ceph-common/tasks/main.yml

index d975ed9d2b77932ea78b86891d36b4d0ac148ab8..1c2e3d925438d53cd945de91ea81991b119f3e34 100644 (file)
   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