Fix version check in ceph.conf template

We need to look for ceph_release when comparing with release names,
not ceph_version.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1631789
Signed-off-by: Giulio Fidente <gfidente@redhat.com>
(cherry picked from commit 6126210e0e426a4dc96ef78f90c8c6473f4c5b7c)

diff --git a/roles/ceph-config/templates/ceph.conf.j2 b/roles/ceph-config/templates/ceph.conf.j2
index f755efd43c2fa06bd7ca956d1d56dbeebbcb2b8f..4b760806b8d6292738556b3bc1e09e9119382ac0 100644 (file)
--- a/roles/ceph-config/templates/ceph.conf.j2
+++ b/roles/ceph-config/templates/ceph.conf.j2
@@ -17,7 +17,7 @@ fsid = {{ fsid }}
 {% if common_single_host_mode is defined and common_single_host_mode %}
 osd crush chooseleaf type = 0
 {% endif %}
-{% if ceph_version not in ['jewel', 'kraken', 'luminous'] and containerized_deployment %}
+{% if ceph_release not in ['jewel', 'kraken', 'luminous'] and containerized_deployment %}
 # let's force the admin socket the way it was so we can properly check for existing instances
 # also the line $cluster-$name.$pid.$cctid.asok is only needed when running multiple instances
 # of the same daemon, thing ceph-ansible cannot do at the time of writing