From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Thu, 29 Nov 2018 09:57:54 +0000 (+0100)
Subject: config: remove code related to ceph release prior to luminous
X-Git-Tag: v3.2.5~10
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=e29cdd0a6198df288dd59ac8f92c01f62a2df789;p=ceph-ansible.git

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 <gabrioux@redhat.com>
(cherry picked from commit 1bbdde272f6ae2107174cd521132b4c2f7ed325a)
---

diff --git a/roles/ceph-config/templates/ceph.conf.j2 b/roles/ceph-config/templates/ceph.conf.j2
index eab650bef..8440a3e65 100644
--- a/roles/ceph-config/templates/ceph.conf.j2
+++ b/roles/ceph-config/templates/ceph.conf.j2
@@ -17,12 +17,6 @@ fsid = {{ fsid }}
 {% 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 %}