stackforge/puppet-openstack-cloud
Code Issues Proposed changes

ceph/pools: don't create keyring for nova

Browse Source 
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi
2014-03-03 16:31:56 +01:00
parent c8ab5200ea
commit c446395a7b
1 changed files with 2 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,7 +51,7 @@ class cloud::storage::rbd::pools(
exec { "create_${cinder_rbd_pool}_user_and_key": exec { "create_${cinder_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.${cinder_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}'", command => "ceph auth get-or-create client.${cinder_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}'",
unless => "ceph auth list 2> /dev/null | egrep -sq '^client.${cinder_rbd_user}$'", unless => "ceph auth list 2> /dev/null | egrep -sq '^client.${cinder_rbd_user}$'",
require => Exec["create_${cinder_rbd_pool}_pool"]; require => Exec["create_${cinder_rbd_pool}_pool"];
} }
@@ -62,13 +62,6 @@ class cloud::storage::rbd::pools(
unless => "/usr/bin/rados lspools | grep -sq ${nova_rbd_pool}", unless => "/usr/bin/rados lspools | grep -sq ${nova_rbd_pool}",
} }
exec { "create_${nova_rbd_pool}_user_and_key":
# 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=${nova_rbd_pool}'",
unless => "ceph auth list 2> /dev/null | egrep -sq '^client.${nova_rbd_user}$'",
require => Exec["create_${nova_rbd_pool}_pool"];
}
if $::ceph_keyring_glance { if $::ceph_keyring_glance {
# NOTE(fc): Puppet needs to run a second time to enter this # NOTE(fc): Puppet needs to run a second time to enter this
ceph::key { $glance_rbd_user: ceph::key { $glance_rbd_user:
@@ -95,19 +88,6 @@ class cloud::storage::rbd::pools(
} }
} }
if $::ceph_keyring_nova {
# NOTE(fc): Puppet needs to run a second time to enter this
ceph::key { $nova_rbd_user:
secret => $::ceph_keyring_nova,
keyring_path => "/etc/ceph/ceph.client.${nova_rbd_user}.keyring"
} ->
file { "/etc/ceph/ceph.client.${nova_rbd_user}.keyring":
owner => 'nova',
group => 'nova',
mode => '0400'
}
}
$clients = [$glance_rbd_user, $cinder_rbd_user, $nova_rbd_user] $clients = [$glance_rbd_user, $cinder_rbd_user, $nova_rbd_user]
@@concat::fragment { 'ceph-clients-os': @@concat::fragment { 'ceph-clients-os':
target => '/etc/ceph/ceph.conf', target => '/etc/ceph/ceph.conf',
@@ -138,7 +118,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_cinder};virsh secret-set-value --secret ${ceph_fsid} --base64 ${::ceph_keyring_nova}", command => "virsh secret-set-value --secret ${ceph_fsid} --base64 ${::ceph_keyring_cinder}",
tag => 'ceph_compute_set_secret', tag => 'ceph_compute_set_secret',
refreshonly => true, refreshonly => true,
} }