mon: remove mgr key from ceph_config_keys

This key is created after the last mon is up so there is no need to try
to push it from the first mon. The initia mon container is not creating
the mgr key, ansible does. So this key will never exist.
The key will go into the fetch dir once the last mon is up, then when
the ceph-mgr plays it will try to get it from the fetch directory.

Signed-off-by: Sébastien Han <seb@redhat.com>
pull/2540/head
Sébastien Han 2018-04-19 18:54:53 +02:00 committed by Guillaume Abrioux
parent 35c1eb7183
commit 949507d304
2 changed files with 1 additions and 20 deletions

View File

@ -19,26 +19,6 @@
ceph_config_keys: "{{ ceph_config_keys + bootstrap_rbd_keyring }}" ceph_config_keys: "{{ ceph_config_keys + bootstrap_rbd_keyring }}"
when: ceph_release_num[ceph_release] >= ceph_release_num.luminous when: ceph_release_num[ceph_release] >= ceph_release_num.luminous
- name: set_fact tmp_ceph_mgr_keys add mgr keys to config and keys paths
set_fact:
tmp_ceph_mgr_keys: /etc/ceph/{{ cluster }}.mgr.{{ hostvars[item]['ansible_hostname'] }}.keyring
with_items: "{{ groups.get(mgr_group_name, []) }}"
register: tmp_ceph_mgr_keys_result
when:
- groups.get(mgr_group_name, []) | length > 0
- name: set_fact ceph_mgr_keys convert mgr keys to an array
set_fact:
ceph_mgr_keys: "{{ tmp_ceph_mgr_keys_result.results | map(attribute='ansible_facts.tmp_ceph_mgr_keys') | list }}"
when:
- groups.get(mgr_group_name, []) | length > 0
- name: set_fact ceph_config_keys merge mgr keys to config and keys paths
set_fact:
ceph_config_keys: "{{ ceph_config_keys + ceph_mgr_keys }}"
when:
- groups.get(mgr_group_name, []) | length > 0
- name: stat for ceph config and keys - name: stat for ceph config and keys
local_action: local_action:
module: stat module: stat

View File

@ -78,6 +78,7 @@
- name: include fetch_configs.yml - name: include fetch_configs.yml
include: fetch_configs.yml include: fetch_configs.yml
run_once: true
when: not containerized_deployment_with_kv when: not containerized_deployment_with_kv
- name: create ceph rest api keyring when mon is containerized - name: create ceph rest api keyring when mon is containerized