diff --git a/manifests/compute/rbd.pp b/manifests/compute/rbd.pp
index 05848ff98..067b7cd75 100644
--- a/manifests/compute/rbd.pp
+++ b/manifests/compute/rbd.pp
@@ -77,7 +77,7 @@ class nova::compute::rbd (
 
     exec { 'set-secret-value virsh':
       command => "/usr/bin/virsh secret-set-value --secret $(cat /etc/nova/virsh.secret) --base64 $(ceph auth get-key ${rbd_keyring})",
-      unless  => "/usr/bin/virsh secret-list | grep ${rbd_keyring}",
+      unless  => "/usr/bin/virsh secret-list | grep ${libvirt_rbd_secret_uuid}",
       require => Exec['get-or-set virsh secret']
     }