diff --git a/manifests/compute/rbd.pp b/manifests/compute/rbd.pp
index 6d7b3abdd..d520c0ecf 100644
--- a/manifests/compute/rbd.pp
+++ b/manifests/compute/rbd.pp
@@ -76,8 +76,8 @@ 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 ${libvirt_rbd_secret_uuid}",
+      command => "/usr/bin/virsh secret-set-value --secret ${libvirt_rbd_secret_uuid} --base64 $(ceph auth get-key ${rbd_keyring})",
+      unless  => "/usr/bin/virsh secret-get-value ${libvirt_rbd_secret_uuid}",
       require => Exec['get-or-set virsh secret']
     }
 
diff --git a/spec/classes/nova_compute_rbd_spec.rb b/spec/classes/nova_compute_rbd_spec.rb
index 25e6a84e7..f442810f8 100644
--- a/spec/classes/nova_compute_rbd_spec.rb
+++ b/spec/classes/nova_compute_rbd_spec.rb
@@ -85,7 +85,7 @@ describe 'nova::compute::rbd' do
           :require => 'File[/etc/nova/secret.xml]'
         )
         is_expected.to contain_exec('set-secret-value virsh').with(
-          :command => "/usr/bin/virsh secret-set-value --secret $(cat /etc/nova/virsh.secret) --base64 $(ceph auth get-key client.rbd_test)"
+          :command => "/usr/bin/virsh secret-set-value --secret UUID --base64 $(ceph auth get-key client.rbd_test)"
         )
       end
     end