stackforge/puppet-openstack-cloud
Code Issues Proposed changes

hypervisor/storage: fix scope

Browse Source 
Close #309

Signed-off-by: Emilien Macchi <emilien.macchi@enovance.com>
This commit is contained in:
Emilien Macchi 2014-02-27 10:32:10 +01:00
parent fe2c6c63d6
commit f7733edfe4
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/compute/hypervisor.pp
View File

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

6
manifests/volume/storage.pp
View File

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