Merge "Pull cinder cephx keyring only when enable_cinder is true in nova"
This commit is contained in:
commit
00e3d2f805
@ -49,6 +49,7 @@
|
||||
register: cinder_cephx_raw_key
|
||||
delegate_to: "{{ groups['ceph-mon'][0] }}"
|
||||
when:
|
||||
- enable_cinder | bool
|
||||
- cinder_backend_ceph | bool
|
||||
changed_when: False
|
||||
run_once: True
|
||||
@ -74,7 +75,7 @@
|
||||
enabled: true
|
||||
- uuid: "{{ cinder_rbd_secret_uuid }}"
|
||||
name: client.cinder secret
|
||||
enabled: "{{ cinder_backend_ceph | bool }}"
|
||||
enabled: "{{ enable_cinder | bool and cinder_backend_ceph | bool}}"
|
||||
|
||||
- name: Pushing secrets key for libvirt
|
||||
copy:
|
||||
@ -89,5 +90,5 @@
|
||||
content: "{{ nova_cephx_raw_key.stdout }}"
|
||||
enabled: true
|
||||
- uuid: "{{ cinder_rbd_secret_uuid }}"
|
||||
content: "{{ cinder_cephx_raw_key.stdout }}"
|
||||
enabled: "{{ cinder_backend_ceph | bool }}"
|
||||
content: "{{ cinder_cephx_raw_key.stdout|default('') }}"
|
||||
enabled: "{{ enable_cinder | bool and cinder_backend_ceph | bool}}"
|
||||
|
Loading…
x
Reference in New Issue
Block a user