stackforge/puppet-openstack-cloud
Code Issues Proposed changes

rbd/pools: fix keyring for cinder and nova

Browse Source 
Close bug #309
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-02-28 19:00:08 +01:00
parent 722ebb9e37
commit c8ab5200ea
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -64,7 +64,7 @@ class cloud::storage::rbd::pools(
exec { "create_${nova_rbd_pool}_user_and_key": exec { "create_${nova_rbd_pool}_user_and_key":
# TODO: point PG num with a cluster variable # TODO: point PG num with a cluster variable
command => "ceph auth get-or-create client.${nova_rbd_user} mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rx pool=${glance_rbd_pool}, allow rwx pool=${cinder_rbd_pool}, allow rwx pool=${nova_rbd_pool}'", command => "ceph auth get-or-create client.${nova_rbd_user} mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rx pool=${glance_rbd_pool}, allow rwx pool=${nova_rbd_pool}'",
unless => "ceph auth list 2> /dev/null | egrep -sq '^client.${nova_rbd_user}$'", unless => "ceph auth list 2> /dev/null | egrep -sq '^client.${nova_rbd_user}$'",
require => Exec["create_${nova_rbd_pool}_pool"]; require => Exec["create_${nova_rbd_pool}_pool"];
} }
@@ -138,7 +138,7 @@ class cloud::storage::rbd::pools(
} }
@@exec { 'set_secret_value_virsh': @@exec { 'set_secret_value_virsh':
command => "virsh secret-set-value --secret ${ceph_fsid} --base64 ${::ceph_keyring_nova}", command => "virsh secret-set-value --secret ${ceph_fsid} --base64 ${::ceph_keyring_cinder};virsh secret-set-value --secret ${ceph_fsid} --base64 ${::ceph_keyring_nova}",
tag => 'ceph_compute_set_secret', tag => 'ceph_compute_set_secret',
refreshonly => true, refreshonly => true,
} }