From 6126210e0e426a4dc96ef78f90c8c6473f4c5b7c Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 24 Sep 2018 10:17:02 +0200 Subject: [PATCH] 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 --- roles/ceph-config/templates/ceph.conf.j2 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/ceph-config/templates/ceph.conf.j2 b/roles/ceph-config/templates/ceph.conf.j2 index 943acad22..090d5fb51 100644 --- 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 -- 2.39.5