diff --git a/manifests/storage/rbd/pools.pp b/manifests/storage/rbd/pools.pp
index 3dc4e281..d01d331f 100644
--- a/manifests/storage/rbd/pools.pp
+++ b/manifests/storage/rbd/pools.pp
@@ -77,7 +77,7 @@ osd 'allow class-read object_prefix rbd_children, allow rwx pool=${glance_pool},
 
     @@exec { 'get-or-set virsh secret':
       command => 'virsh secret-define --file /etc/ceph/secret.xml',
-      unless  => "virsh secret-list | tail -n +3 | awk '{print $1}' | grep -sq ${ceph_fsid}",
+      unless  => "virsh secret-list | tail -n +3 | cut -f1 -d' ' | grep -sq ${ceph_fsid}",
       tag     => 'ceph_compute_get_secret',
       require => [ Package['libvirt-bin'], File['/etc/ceph/secret.xml'] ],
     }
diff --git a/templates/storage/ceph/secret-compute.xml.erb b/templates/storage/ceph/secret-compute.xml.erb
index 4ec9cf8f..3cd567b3 100644
--- a/templates/storage/ceph/secret-compute.xml.erb
+++ b/templates/storage/ceph/secret-compute.xml.erb
@@ -1,6 +1,6 @@
 <secret ephemeral='no' private='no'>
   <usage type='ceph'>
-    <name><%= @glance_user %> secret</name>
+    <name>client.<%= @glance_user %> secret</name>
   </usage>
   <uuid><%= @ceph_fsid %></uuid>
 </secret>