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

rbd: fix bug when trying to fetch key 

With jewel, `bootstrap_rbd_keyring` is not set because of this condition:

```
when:
  - ceph_release_num.{{ ceph_release }} >= ceph_release_num.luminous
```

Therefore, the task `try to fetch ceph config and keys` will fail.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
pull/2006/head
Guillaume Abrioux 2017-10-05 22:25:34 +02:00
parent 1121a840ef
commit d363b0f741
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
roles/ceph-rbd-mirror/tasks/docker/copy_configs.yml
View File

@ -9,7 +9,7 @@
set_fact: set_fact:
ceph_config_keys: ceph_config_keys:
- /etc/ceph/{{ cluster }}.client.admin.keyring - /etc/ceph/{{ cluster }}.client.admin.keyring
- "{{ bootstrap_rbd_keyring | default([]) }}" - "{{ bootstrap_rbd_keyring | default('') }}"
- name: stat for ceph config and keys - name: stat for ceph config and keys
local_action: stat path={{ fetch_directory }}/{{ fsid }}/{{ item }} local_action: stat path={{ fetch_directory }}/{{ fsid }}/{{ item }}
@ -19,6 +19,7 @@
failed_when: false failed_when: false
always_run: true always_run: true
register: statconfig register: statconfig
when: "item | length > 0"
- name: try to fetch ceph config and keys - name: try to fetch ceph config and keys
copy: copy:
@ -32,6 +33,7 @@
- "{{ ceph_config_keys }}" - "{{ ceph_config_keys }}"
- "{{ statconfig.results }}" - "{{ statconfig.results }}"
when: when:
- not item.1.get('skipped')
- item.1.stat.exists == true - item.1.stat.exists == true
- name: set selinux permissions - name: set selinux permissions