mon: enable msgr2

Enabling msgr2 style declaration for Nautilus and above. Prior releases
will keep the right syntax.
When upgrading from Mimic to Nautilus we must maintain something in the
form of:

mon_host = [v1:127.0.0.1:6789/0,v2:127.0.0.1:3300/0]

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/3522/head
Sébastien Han 2019-01-21 12:08:56 +01:00 committed by Guillaume Abrioux
parent fc34fb1bd9
commit 5babc1b4eb
1 changed files with 5 additions and 1 deletions

View File

@ -37,9 +37,13 @@ fsid = {{ fsid }}
log file = /dev/null log file = /dev/null
mon cluster log file = /dev/null mon cluster log file = /dev/null
{% endif %} {% endif %}
{% if ceph_release not in ['jewel', 'kraken', 'luminous', 'mimic'] %}
{% set mon_host_v1_suffix = ":6789" %}
{% set mon_host_v2_suffix = ":3300" %}
{% endif %}
mon host = {% if nb_mon > 0 %} mon host = {% if nb_mon > 0 %}
{% for host in _monitor_addresses -%} {% for host in _monitor_addresses -%}
{{ host.addr }} [{{ "v2:" + host.addr + mon_host_v2_suffix }},{{ "v1:" + host.addr + mon_host_v1_suffix }}]
{%- if not loop.last -%},{%- endif %} {%- if not loop.last -%},{%- endif %}
{%- endfor %} {%- endfor %}
{% elif nb_mon == 0 and inventory_hostname in groups.get(client_group_name, []) %} {% elif nb_mon == 0 and inventory_hostname in groups.get(client_group_name, []) %}