diff --git a/ansible/roles/nova/tasks/ceph.yml b/ansible/roles/nova/tasks/ceph.yml
index 1d0df980f276f4b1ff964e64cea9002ef585fca1..7d4a8ed08d0d28a988094fbf9437eb9e99605114 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}}"