Merge "Pull cinder cephx keyring only when cinder_backup_ceph is true in nova"

This commit is contained in:
Jenkins 2017-06-25 04:42:21 +00:00 committed by Gerrit Code Review
commit 6e91f2e7f0

@ -48,6 +48,8 @@
command: docker exec ceph_mon ceph auth get-key client.cinder
register: cinder_cephx_raw_key
delegate_to: "{{ groups['ceph-mon'][0] }}"
when:
- cinder_backend_ceph | bool
changed_when: False
run_once: True
@ -72,7 +74,7 @@
enabled: true
- uuid: "{{ cinder_rbd_secret_uuid }}"
name: client.cinder secret
enabled: "{{ cinder_backend_ceph }}"
enabled: "{{ cinder_backend_ceph | bool }}"
- name: Pushing secrets key for libvirt
copy:
@ -88,4 +90,4 @@
enabled: true
- uuid: "{{ cinder_rbd_secret_uuid }}"
content: "{{ cinder_cephx_raw_key.stdout }}"
enabled: "{{ cinder_backend_ceph }}"
enabled: "{{ cinder_backend_ceph | bool }}"