From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 21 Feb 2019 09:30:29 +0000 (+0100)
Subject: common: do not override ceph_release when ceph_repository is 'rhcs'
X-Git-Tag: v3.2.7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8cc75e516c31ca4585e79cf338a879ea81c4f81d;p=ceph-ansible.git

common: do not override ceph_release when ceph_repository is 'rhcs'

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)
---

diff --git a/roles/ceph-common/tasks/main.yml b/roles/ceph-common/tasks/main.yml
index 1c2e3d925..c0fc52698 100644
--- a/roles/ceph-common/tasks/main.yml
+++ b/roles/ceph-common/tasks/main.yml
@@ -48,6 +48,7 @@
     ceph_release: "{{ ceph_stable_release }}"
   when:
     - ceph_origin == 'repository'
+    - ceph_repository not in ['dev', 'rhcs']
   tags:
     - always