openstack/kolla-ansible
Code Issues Proposed changes

Pull cinder cephx keyring only when cinder_backup_ceph is true in nova

Browse Source 
Change-Id: Ia766c1aa60d51fbff2c620394474597a7146b9cc
Closes-Bug: #1699658
This commit is contained in:
Jeffrey Zhang 2017-06-22 12:34:16 +08:00
parent 9dc17cee0f
commit a1f42ad38a
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/nova/tasks/ceph.yml
View File

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