ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
pull/3505/head
Guillaume Abrioux 2018-11-29 10:57:54 +01:00 committed by mergify[bot]
parent e9188cd202
commit 1bbdde272f
1 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
roles/ceph-config/templates/ceph.conf.j2
View File

@ -14,12 +14,6 @@ ms bind ipv6 = true
{% if common_single_host_mode is defined and common_single_host_mode %} {% if common_single_host_mode is defined and common_single_host_mode %}
osd crush chooseleaf type = 0 osd crush chooseleaf type = 0
{% endif %} {% 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 #} {# 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 %} {% set nb_mon = groups.get(mon_group_name, []) | length | int %}