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

Merge pull request #1825 from ceph/fix-item 

ceph-docker-common: fix empty array
pull/1826/head
Sébastien Han 2017-08-29 12:15:46 +02:00 committed by GitHub
parent b3e5206289 cfddd2903c
commit d0515cb704
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
roles/ceph-docker-common/tasks/fetch_configs.yml
View File

@ -1,9 +1,4 @@
--- ---
- name: register rbd bootstrap key
set_fact:
bootstrap_rbd_keyring: "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring"
when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
- name: set config and keys paths - name: set config and keys paths
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
@ -13,7 +8,17 @@
- /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
- /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
- /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
- "{{ bootstrap_rbd_keyring | default([]) }}"
- name: register rbd bootstrap key
set_fact:
bootstrap_rbd_keyring:
- "/var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring"
when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
- name: merge rbd bootstrap key to config and keys paths
set_fact:
ceph_config_keys: "{{ ceph_config_keys + bootstrap_rbd_keyring }}"
when: ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
- name: add mgr keys to config and keys paths - name: add mgr keys to config and keys paths
set_fact: set_fact: