mon: fetch initial keyring even when running rolling_update

otherwise, the task to copy mgr keyring fails during the rolling_update.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/3748/head
Guillaume Abrioux 2019-03-20 17:53:22 +01:00 committed by Dimitri Savineau
parent f0e616962d
commit 5c3ce4ca77
1 changed files with 12 additions and 15 deletions

View File

@ -16,21 +16,19 @@
delay: "{{ handler_health_mon_check_delay }}" delay: "{{ handler_health_mon_check_delay }}"
changed_when: false changed_when: false
- name: fetch ceph initial keys
ceph_key:
state: fetch_initial_keys
cluster: "{{ cluster }}"
owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
group: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
mode: "0400"
environment:
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
CEPH_ROLLING_UPDATE: "{{ rolling_update }}"
when:
- cephx
- block: - block:
- name: fetch ceph initial keys
ceph_key:
state: fetch_initial_keys
cluster: "{{ cluster }}"
owner: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
group: "{{ ceph_uid if containerized_deployment else 'ceph' }}"
mode: "0400"
environment:
CEPH_CONTAINER_IMAGE: "{{ ceph_docker_registry + '/' + ceph_docker_image + ':' + ceph_docker_image_tag if containerized_deployment else None }}"
CEPH_CONTAINER_BINARY: "{{ container_binary }}"
CEPH_ROLLING_UPDATE: "{{ rolling_update }}"
- name: create ceph mgr keyring(s) - name: create ceph mgr keyring(s)
ceph_key: ceph_key:
name: "mgr.{{ hostvars[item]['ansible_hostname'] }}" name: "mgr.{{ hostvars[item]['ansible_hostname'] }}"
@ -62,7 +60,6 @@
delegate_to: "{{ groups[mon_group_name][0] }}" delegate_to: "{{ groups[mon_group_name][0] }}"
when: when:
- cephx - cephx
- not rolling_update
- name: copy keys to the ansible server - name: copy keys to the ansible server
fetch: fetch: