From 5c3ce4ca779f92cbc2e26ca5790bf67a6417414b Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 20 Mar 2019 17:53:22 +0100 Subject: [PATCH] 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 --- roles/ceph-mon/tasks/ceph_keys.yml | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/roles/ceph-mon/tasks/ceph_keys.yml b/roles/ceph-mon/tasks/ceph_keys.yml index 141e4055b..84ff97773 100644 --- a/roles/ceph-mon/tasks/ceph_keys.yml +++ b/roles/ceph-mon/tasks/ceph_keys.yml @@ -16,21 +16,19 @@ delay: "{{ handler_health_mon_check_delay }}" 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: + - 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) ceph_key: name: "mgr.{{ hostvars[item]['ansible_hostname'] }}" @@ -62,7 +60,6 @@ delegate_to: "{{ groups[mon_group_name][0] }}" when: - cephx - - not rolling_update - name: copy keys to the ansible server fetch: