]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph-ansible.git/commitdiff
rbd: fix missing keyring on nodes
authorGuillaume Abrioux <gabrioux@redhat.com>
Tue, 19 Sep 2017 09:22:56 +0000 (11:22 +0200)
committerGuillaume Abrioux <gabrioux@redhat.com>
Thu, 21 Sep 2017 07:56:37 +0000 (09:56 +0200)
the rbd key was not pushed on rbd nodes because its keyring path was not
added in `ceph_config_keys`.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
roles/ceph-mon/tasks/docker/copy_configs.yml

index 9d04704d877e95cb4567505fd842852016da5a5e..1fa9e7424284141d58905cd850478f1f45d1bf5c 100644 (file)
@@ -8,6 +8,18 @@
       - /var/lib/ceph/bootstrap-osd/{{ cluster }}.keyring
       - /var/lib/ceph/bootstrap-rgw/{{ cluster }}.keyring
       - /var/lib/ceph/bootstrap-mds/{{ cluster }}.keyring
+      - /var/lib/ceph/bootstrap-rbd/{{ cluster }}.keyring
+
+- 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: set_fact tmp_ceph_mgr_keys add mgr keys to config and keys paths
   set_fact: