From 1bbdde272f6ae2107174cd521132b4c2f7ed325a Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Thu, 29 Nov 2018 10:57:54 +0100 Subject: [PATCH] config: remove code related to ceph release prior to luminous This part of the code is not needed since ceph-ansible@master is intended to deploy ceph@master only. Signed-off-by: Guillaume Abrioux --- roles/ceph-config/templates/ceph.conf.j2 | 6 ------ 1 file changed, 6 deletions(-) diff --git a/roles/ceph-config/templates/ceph.conf.j2 b/roles/ceph-config/templates/ceph.conf.j2 index a21b0e4e9..4ce937f07 100644 --- a/roles/ceph-config/templates/ceph.conf.j2 +++ b/roles/ceph-config/templates/ceph.conf.j2 @@ -14,12 +14,6 @@ ms bind ipv6 = true {% if common_single_host_mode is defined and common_single_host_mode %} osd crush chooseleaf type = 0 {% endif %} -{% 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 -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 %} -- 2.39.5