stackforge/puppet-openstack-cloud
Code Issues Proposed changes

cinder keyring: align cinder & nova permissions

Browse Source 
Set same permissions on the same resource to avoid conflicts when puppet
compiles the catalog.

Bug #402
This commit is contained in:
Emilien Macchi 2014-04-10 23:43:20 +02:00
parent 9a44bacecc
commit a9bb8537d5
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/compute/hypervisor.pp
View File

@ -144,9 +144,9 @@ Host *
Ceph::Key <<| title == $cinder_rbd_user |>> Ceph::Key <<| title == $cinder_rbd_user |>>
ensure_resource('file', "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring", { ensure_resource('file', "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring", {
owner => 'nova', owner => 'cinder',
group => 'nova', group => 'cinder',
mode => '0400', mode => '0444',
require => "Ceph::Key[${cinder_rbd_user}]", require => "Ceph::Key[${cinder_rbd_user}]",
}) })
Concat::Fragment <<| title == 'ceph-client-os' |>> Concat::Fragment <<| title == 'ceph-client-os' |>>

2
manifests/volume/backend/rbd.pp
View File

@ -76,7 +76,7 @@ define cloud::volume::backend::rbd (
ensure_resource('file', "/etc/ceph/ceph.client.${rbd_user}.keyring", { ensure_resource('file', "/etc/ceph/ceph.client.${rbd_user}.keyring", {
owner => 'cinder', owner => 'cinder',
group => 'cinder', group => 'cinder',
mode => '0400', mode => '0444',
require => "Ceph::Key[${rbd_user}]", require => "Ceph::Key[${rbd_user}]",
}) })
Concat::Fragment <<| title == 'ceph-client-os' |>> Concat::Fragment <<| title == 'ceph-client-os' |>>