stackforge/puppet-openstack-cloud
Code Issues Proposed changes

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

Browse Source 
rbd/pools: avoid dupplicated resource for keyring
This commit is contained in:
Emilien Macchi 2014-03-04 18:39:44 +01:00
commit 6bbe3f9641
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -63,12 +63,7 @@ class cloud::storage::rbd::pools(
secret => $::ceph_keyring_glance, secret => $::ceph_keyring_glance,
keyring_path => "/etc/ceph/ceph.client.${glance_rbd_user}.keyring" keyring_path => "/etc/ceph/ceph.client.${glance_rbd_user}.keyring"
} }
Ceph::Key <<| title == $cinder_rbd_user |>> -> Ceph::Key <<| title == $cinder_rbd_user |>>
file { "/etc/ceph/ceph.client.${glance_rbd_user}.keyring":
owner => 'glance',
group => 'glance',
mode => '0400'
}
} }
if $::ceph_keyring_cinder { if $::ceph_keyring_cinder {
@ -77,12 +72,7 @@ class cloud::storage::rbd::pools(
secret => $::ceph_keyring_cinder, secret => $::ceph_keyring_cinder,
keyring_path => "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring" keyring_path => "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring"
} }
Ceph::Key <<| title == $cinder_rbd_user |>> -> Ceph::Key <<| title == $cinder_rbd_user |>>
file { "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring":
owner => 'cinder',
group => 'cinder',
mode => '0400'
}
} }
$clients = [$glance_rbd_user, $cinder_rbd_user] $clients = [$glance_rbd_user, $cinder_rbd_user]