From 6a12fd8a85238173f49761f8e46bab6f8e65b33a Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Sat, 8 Jul 2017 12:14:19 +0800
Subject: [PATCH] Pull cinder cephx keyring only when enable_cinder is true in
nova
cinder_backup_ceph is true in default when enable_ceph is true.
Change-Id: Ic3cbd041a784610323cda4419acb6702f2aa35c1
Closes-Bug: #1699658
---
ansible/roles/nova/tasks/ceph.yml | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/ansible/roles/nova/tasks/ceph.yml b/ansible/roles/nova/tasks/ceph.yml
index 9bc09e816..03e81b789 100644
--- a/ansible/roles/nova/tasks/ceph.yml
+++ b/ansible/roles/nova/tasks/ceph.yml
@@ -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}}"
--
GitLab