stackforge/puppet-openstack-cloud
Code Issues Proposed changes

Merge pull request #323 from enovance/enhancement/309/emilien

Browse Source 
rbd: export keyring
This commit is contained in:
Emilien Macchi
2014-03-04 16:45:03 +01:00
parent 2a36b20179 8ffe9850a4
commit ecf90395aa
2 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
manifests/compute/hypervisor.pp
View File

@@ -115,6 +115,9 @@ Host *
class { 'nova::compute::neutron': }
if $has_ceph {
include 'cloud::storage::rbd'
# TODO(EmilienM) Temporary, while https://review.openstack.org/#/c/72440 got merged
nova_config {
'DEFAULT/libvirt_images_type': value => 'rbd';

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

@@ -59,10 +59,11 @@ class cloud::storage::rbd::pools(
if $::ceph_keyring_glance {
# NOTE(fc): Puppet needs to run a second time to enter this
ceph::key { $glance_rbd_user:
@@ceph::key { $glance_rbd_user:
secret => $::ceph_keyring_glance,
keyring_path => "/etc/ceph/ceph.client.${glance_rbd_user}.keyring"
} ->
}
Ceph::Key <<| title == $cinder_rbd_user |>> ->
file { "/etc/ceph/ceph.client.${glance_rbd_user}.keyring":
owner => 'glance',
group => 'glance',
@@ -72,10 +73,11 @@ class cloud::storage::rbd::pools(
if $::ceph_keyring_cinder {
# NOTE(fc): Puppet needs to run a second time to enter this
ceph::key { $cinder_rbd_user:
@@ceph::key { $cinder_rbd_user:
secret => $::ceph_keyring_cinder,
keyring_path => "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring"
} ->
}
Ceph::Key <<| title == $cinder_rbd_user |>> ->
file { "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring":
owner => 'cinder',
group => 'cinder',
@@ -90,15 +92,6 @@ class cloud::storage::rbd::pools(
content => template('cloud/storage/ceph/ceph-client.conf.erb')
}
#exec { "create cinder backup pool":
#TODO: point PG num with a cluster variable + keyring
# command => "/usr/bin/ceph osd pool create ${::cinder_backup_pool} 128 128",
# command => "ceph auth get-or-create client.${::cinder_backup_user} mon 'allow r' osd 'allow class-read object_prefix rbd_children, allow rwx pool=${::cinder_backup_pool}'",
# unless => "/usr/bin/rados lspools | grep -sq ${::cinder_backup_pool}",
# unless => "ceph auth list | egrep '^${::cinder_backup_pool}$'",
# require => Ceph::Key['admin'],
#}
@@file { '/etc/ceph/secret.xml':
content => template('cloud/storage/ceph/secret-compute.xml.erb'),
tag => 'ceph_compute_secret_file',