stackforge/puppet-openstack-cloud
Code Issues Proposed changes

rbd: Ensure keyring has right permissions

Browse Source 
Close bug #309
Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-03-04 18:22:25 +01:00
parent 8e537e4b50
commit 118d3bd400
3 changed files with 15 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/compute/hypervisor.pp
View File

@ -140,13 +140,11 @@ Host *
Exec <<| tag == 'set_secret_value_virsh' |>> Exec <<| tag == 'set_secret_value_virsh' |>>
Ceph::Key <<| title == $cinder_rbd_user |>> Ceph::Key <<| title == $cinder_rbd_user |>>
if defined(Ceph::Key[$cinder_rbd_user]) { file { "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring":
file { "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring": owner => 'nova',
owner => 'nova', group => 'nova',
group => 'nova', mode => '0400',
mode => '0400', require => Ceph::Key[$cinder_rbd_user]
require => Ceph::Key[$cinder_rbd_user]
}
} }
Concat::Fragment <<| title == 'ceph-client-os' |>> Concat::Fragment <<| title == 'ceph-client-os' |>>
} }

12
manifests/image.pp
View File

@ -152,13 +152,11 @@ class cloud::image(
} }
Ceph::Key <<| title == $glance_rbd_user |>> Ceph::Key <<| title == $glance_rbd_user |>>
if defined(Ceph::Key[$glance_rbd_user]) { file { '/etc/ceph/ceph.client.glance.keyring':
file { '/etc/ceph/ceph.client.glance.keyring': owner => 'glance',
owner => 'glance', group => 'glance',
group => 'glance', mode => '0400',
mode => '0400', require => Ceph::Key[$glance_rbd_user]
require => Ceph::Key[$glance_rbd_user]
}
} }
Concat::Fragment <<| title == 'ceph-client-os' |>> Concat::Fragment <<| title == 'ceph-client-os' |>>

12
manifests/volume/storage.pp
View File

@ -74,13 +74,11 @@ class cloud::volume::storage(
} }
Ceph::Key <<| title == $cinder_rbd_user |>> Ceph::Key <<| title == $cinder_rbd_user |>>
if defined(Ceph::Key[$cinder_rbd_user]) { file { "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring":
file { "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring": owner => 'cinder',
owner => 'cinder', group => 'cinder',
group => 'cinder', mode => '0400',
mode => '0400', require => Ceph::Key[$cinder_rbd_user]
require => Ceph::Key[$cinder_rbd_user]
}
} }
Concat::Fragment <<| title == 'ceph-client-os' |>> Concat::Fragment <<| title == 'ceph-client-os' |>>