stackforge/puppet-openstack-cloud
Code Issues Proposed changes

storage: fix secret name

Browse Source
This commit is contained in:
Sebastien Badia 2014-01-08 12:17:38 +01:00
parent 4c1bbf6ea8
commit 3e5a46c0dc
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/storage/rbd/pools.pp
View File

@ -77,7 +77,7 @@ osd 'allow class-read object_prefix rbd_children, allow rwx pool=${glance_pool},
@@exec { 'get-or-set virsh secret': @@exec { 'get-or-set virsh secret':
command => 'virsh secret-define --file /etc/ceph/secret.xml', 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', tag => 'ceph_compute_get_secret',
require => [ Package['libvirt-bin'], File['/etc/ceph/secret.xml'] ], require => [ Package['libvirt-bin'], File['/etc/ceph/secret.xml'] ],
} }

2
templates/storage/ceph/secret-compute.xml.erb
View File

@ -1,6 +1,6 @@
<secret ephemeral='no' private='no'> <secret ephemeral='no' private='no'>
<usage type='ceph'> <usage type='ceph'>
<name><%= @glance_user %> secret</name> <name>client.<%= @glance_user %> secret</name>
</usage> </usage>
<uuid><%= @ceph_fsid %></uuid> <uuid><%= @ceph_fsid %></uuid>
</secret> </secret>