rolling_update: remove msgr2 migration

In Pacific we're are sure that users already achieved the msgr2 because
that was introduced in Nautilus.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index bfa5453d364a726f24b80a9041734a5c56f7ac17..9973268ec94e47cd47bbf983d8ed4fde7f91ee48 100644 (file)
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -842,22 +842,14 @@
         name: ceph-crash
 
 - name: complete upgrade
-  hosts:
-  - "{{ mon_group_name | default('mons') }}"
-  - "{{ mgr_group_name | default('mgrs') }}"
-  - "{{ osd_group_name | default('osds') }}"
-  - "{{ mds_group_name | default('mdss') }}"
-  - "{{ rgw_group_name | default('rgws') }}"
-  - "{{ nfs_group_name | default('nfss') }}"
-  - "{{ rbdmirror_group_name | default('rbdmirrors') }}"
-  - "{{ client_group_name | default('clients') }}"
-  - "{{ iscsi_gw_group_name | default('iscsigws') }}"
+  hosts: "{{ mon_group_name | default('mons') }}"
   become: True
   tasks:
     - import_role:
         name: ceph-defaults
     - import_role:
         name: ceph-facts
+        tasks_from: container_binary.yml
 
     - name: container | disallow pre-pacific OSDs and enable all new pacific-only functionality
       command: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] }} ceph --cluster {{ cluster }} osd require-osd-release pacific"
@@ -875,30 +867,6 @@
         - not containerized_deployment | bool
         - groups.get(mon_group_name, []) | length > 0
 
-    - name: container | enable msgr2 protocol
-      command: "{{ container_binary }} exec ceph-mon-{{ hostvars[groups[mon_group_name][0]]['ansible_hostname'] }} ceph --cluster {{ cluster }} mon enable-msgr2"
-      delegate_to: "{{ groups[mon_group_name][0] }}"
-      run_once: True
-      when:
-        - containerized_deployment | bool
-        - groups.get(mon_group_name, []) | length > 0
-
-    - name: non container | enable msgr2 protocol
-      command: "ceph --cluster {{ cluster }} mon enable-msgr2"
-      delegate_to: "{{ groups[mon_group_name][0] }}"
-      run_once: True
-      when:
-        - not containerized_deployment | bool
-        - groups.get(mon_group_name, []) | length > 0
-
-    - import_role:
-        name: ceph-handler
-    - name: import_role ceph-config
-      import_role:
-        name: ceph-config
-      vars:
-        msgr2_migration: True
-
 - name: upgrade node-exporter
   hosts: all
   gather_facts: false

diff --git a/roles/ceph-config/templates/ceph.conf.j2 b/roles/ceph-config/templates/ceph.conf.j2
index e6f7a8e043660193444c9bafc3b01c4780d6c661..0b0588bd96e1ffec9a6fafff1802810ecac571d0 100644 (file)
--- a/roles/ceph-config/templates/ceph.conf.j2
+++ b/roles/ceph-config/templates/ceph.conf.j2
@@ -36,16 +36,10 @@ osd pool default crush rule = {{ osd_pool_default_crush_rule }}
 fsid = {{ fsid }}
 mon host = {% if nb_mon > 0 %}
 {% for host in _monitor_addresses -%}
-{% 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 %}
+{% if mon_host_v1.enabled | bool %}
 {% 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 %}
 {% elif nb_mon == 0 %}