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

config: enforce socket name 

This was introduced by
59ee2e8d3b
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 <seb@redhat.com>
pull/2959/head
Sébastien Han 2018-07-30 18:29:00 +02:00 committed by Guillaume Abrioux
parent 6f72f96dad
commit ea9e60d48d
1 changed files with 6 additions and 0 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

@ -17,6 +17,12 @@ fsid = {{ fsid }}
{% 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_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 #} {# 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 %}