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

update: refact msgr2 migration 

this commit refact the msgr2 protocol introduction.

If it's a fresh install, let's go with v2 only.
If we upgrade to nautilus, we should go with v2+v1 syntax to ensure
nothing breaks.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
(cherry picked from commit a4bc7bda51)
pull/3892/head
Guillaume Abrioux 2019-04-16 10:31:44 +02:00
parent 84d6bb226b
commit b4377f6163
4 changed files with 26 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
group_vars/all.yml.sample
View File

@ -337,6 +337,12 @@ dummy:
#ip_version: ipv4
#mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf
#mon_host_v1:
# enabled: True
# suffix: ':6789'
#mon_host_v2:
# suffix: ':3300'
##########
# CEPHFS #
##########

6
group_vars/rhcs.yml.sample
View File

@ -337,6 +337,12 @@ ceph_rhcs_version: 3
#ip_version: ipv4
#mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf
#mon_host_v1:
# enabled: True
# suffix: ':6789'
#mon_host_v2:
# suffix: ':3300'
##########
# CEPHFS #
##########

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

@ -41,16 +41,17 @@ fsid = {{ fsid }}
log file = /dev/null
mon cluster log file = /dev/null
{% 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 %}
{% for host in _monitor_addresses -%}
{% if msgr2_migration | default(False) or not rolling_update %}
[{{ "v2:" + host.addr + mon_host_v2_suffix }},{{ "v1:" + host.addr + mon_host_v1_suffix }}]
{%- else -%}
{% if msgr2_migration | default(False) %}
[{{ "v2:" + host.addr + mon_host_v2.suffix }},{{ "v1:" + host.addr + mon_host_v1.suffix }}]
{%- elif not msgr2_migration | default(False) and rolling_update -%}
{{ host.addr }}
{%- else -%}
{% if mon_host_v1.enabled %}
{% set _v1 = ',v1:' + host.addr + mon_host_v1.suffix %}
{% endif %}
[{{ "v2:" + host.addr + mon_host_v2.suffix }}{{ _v1 | default('') }}]
{%- endif %}
{%- if not loop.last -%},{%- endif %}
{%- endfor %}

6
roles/ceph-defaults/defaults/main.yml
View File

@ -329,6 +329,12 @@ monitor_address_block: subnet
ip_version: ipv4
mon_use_fqdn: false # if set to true, the MON name used will be the fqdn in the ceph.conf
mon_host_v1:
enabled: True
suffix: ':6789'
mon_host_v2:
suffix: ':3300'
##########
# CEPHFS #
##########