Skip to content
Snippets Groups Projects
Commit 00e3d2f8 authored by Jenkins's avatar Jenkins Committed by Gerrit Code Review
Browse files

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

parents f68aa1d9 6a12fd8a
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
ansible/roles/nova/tasks/ceph.yml
+ 4
− 3
View file @ 00e3d2f8
...@@ -49,6 +49,7 @@ ...@@ -49,6 +49,7 @@
register: cinder_cephx_raw_key register: cinder_cephx_raw_key
delegate_to: "{{ groups['ceph-mon'][0] }}" delegate_to: "{{ groups['ceph-mon'][0] }}"
when: when:
- enable_cinder | bool
- cinder_backend_ceph | bool - cinder_backend_ceph | bool
changed_when: False changed_when: False
run_once: True run_once: True
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
enabled: true enabled: true
- uuid: "{{ cinder_rbd_secret_uuid }}" - uuid: "{{ cinder_rbd_secret_uuid }}"
name: client.cinder secret name: client.cinder secret
enabled: "{{ cinder_backend_ceph | bool }}" enabled: "{{ enable_cinder | bool and cinder_backend_ceph | bool}}"
- name: Pushing secrets key for libvirt - name: Pushing secrets key for libvirt
copy: copy:
...@@ -89,5 +90,5 @@ ...@@ -89,5 +90,5 @@
content: "{{ nova_cephx_raw_key.stdout }}" content: "{{ nova_cephx_raw_key.stdout }}"
enabled: true enabled: true
- uuid: "{{ cinder_rbd_secret_uuid }}" - uuid: "{{ cinder_rbd_secret_uuid }}"
content: "{{ cinder_cephx_raw_key.stdout }}" content: "{{ cinder_cephx_raw_key.stdout|default('') }}"
enabled: "{{ cinder_backend_ceph | bool }}" enabled: "{{ enable_cinder | bool and cinder_backend_ceph | bool}}"
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment