Merge "Fix 'nova_cephx_raw_key' is undefined"

This commit is contained in:
Zuul 2019-11-27 16:02:17 +00:00 committed by Gerrit Code Review
commit 296fdfad46

View File

@ -111,11 +111,13 @@
- item.enabled | bool - item.enabled | bool
- external_ceph_cephx_enabled | bool - external_ceph_cephx_enabled | bool
with_items: with_items:
# NOTE(yoctozepto): 'default' filter required due to eager evaluation of item content
# which will be undefined if the applicable condition is False
- uuid: "{{ rbd_secret_uuid }}" - uuid: "{{ rbd_secret_uuid }}"
result: "{{ nova_cephx_raw_key }}" result: "{{ nova_cephx_raw_key | default }}"
enabled: "{{ nova_backend == 'rbd' }}" enabled: "{{ nova_backend == 'rbd' }}"
- uuid: "{{ cinder_rbd_secret_uuid }}" - uuid: "{{ cinder_rbd_secret_uuid }}"
result: "{{ cinder_cephx_raw_key }}" result: "{{ cinder_cephx_raw_key | default }}"
enabled: "{{ cinder_backend_ceph }}" enabled: "{{ cinder_backend_ceph }}"
notify: notify:
- Restart nova-libvirt container - Restart nova-libvirt container