]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
common: do not override ceph_release when ceph_repository is 'rhcs' v3.2.7
authorGuillaume Abrioux <gabrioux@redhat.com>
Thu, 21 Feb 2019 09:30:29 +0000 (10:30 +0100)
committermergify[bot] <mergify[bot]@users.noreply.github.com>
Thu, 21 Feb 2019 13:03:16 +0000 (13:03 +0000)
We shouldn't reset `ceph_release` with `ceph_stable_release` when
`ceph_repository` is `rhcs`

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1645379
Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit 2b60a356343677da6371b7861ee657bfd42c54fd)

roles/ceph-common/tasks/main.yml

index 1c2e3d925438d53cd945de91ea81991b119f3e34..c0fc5269875961631831d4a47c4c9c8d08eb65c2 100644 (file)
@@ -48,6 +48,7 @@
     ceph_release: "{{ ceph_stable_release }}"
   when:
     - ceph_origin == 'repository'
+    - ceph_repository not in ['dev', 'rhcs']
   tags:
     - always