From ea9e60d48d6631631ac9294d4ef291f8d7a30d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Han?= Date: Mon, 30 Jul 2018 18:29:00 +0200 Subject: [PATCH] config: enforce socket name MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was introduced by https://github.com/ceph/ceph/commit/59ee2e8d3b14511e8d07ef8325ac8ca96e051784 and made our socket checks impossible to run. The PID could be found, but the cctid cannot. This happens during upgrade to mimic and on cluster running on mimic. So 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 Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1610220 Signed-off-by: Sébastien Han --- roles/ceph-config/templates/ceph.conf.j2 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/roles/ceph-config/templates/ceph.conf.j2 b/roles/ceph-config/templates/ceph.conf.j2 index 0d1c97393..2948a793c 100644 --- a/roles/ceph-config/templates/ceph.conf.j2 +++ b/roles/ceph-config/templates/ceph.conf.j2 @@ -17,6 +17,12 @@ 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 %} +# 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 +admin socket = "$run_dir/$cluster-$name.asok" +{% endif %} {# NOTE (leseb): the blank lines in-between are needed otherwise we won't get any line break #} {% set nb_mon = groups.get(mon_group_name, []) | length | int %}