stackforge/puppet-openstack-cloud
Code Issues Proposed changes

ceph keys dependencies: use correct syntax for ensure_resource

Browse Source
This commit is contained in:
François Charlier 2014-07-24 16:30:41 +02:00
parent 84e8dbb3c2
commit 2aeb9c1992
2 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
manifests/compute/hypervisor.pp
View File

@ -193,14 +193,19 @@ Host *
}) })
# Configure Ceph keyring # Configure Ceph keyring
Ceph::Key <<| title == $cinder_rbd_user |>> -> Ceph::Key <<| title == $cinder_rbd_user |>>
ensure_resource('file', "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring", { if defined(Ceph::Key[$cinder_rbd_user]) {
owner => 'root', ensure_resource(
group => 'cephkeyring', 'file',
mode => '0440', "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring", {
require => Ceph::Key[$cinder_rbd_user], owner => 'root',
notify => Service['nova-compute'], group => 'cephkeyring',
}) mode => '0440',
require => Ceph::Key[$cinder_rbd_user],
notify => Service['nova-compute'],
}
)
}
Concat::Fragment <<| title == 'ceph-client-os' |>> Concat::Fragment <<| title == 'ceph-client-os' |>>
} else { } else {

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

@ -84,13 +84,15 @@ define cloud::volume::backend::rbd (
}) })
# Configure Ceph keyring # Configure Ceph keyring
Ceph::Key <<| title == $rbd_user |>> -> Ceph::Key <<| title == $rbd_user |>>
ensure_resource('file', "/etc/ceph/ceph.client.${rbd_user}.keyring", { if defined(Ceph::Key[$rbd_user]) {
owner => 'root', ensure_resource('file', "/etc/ceph/ceph.client.${rbd_user}.keyring", {
group => 'cephkeyring', owner => 'root',
mode => '0440', group => 'cephkeyring',
require => Ceph::Key[$rbd_user], mode => '0440',
}) require => Ceph::Key[$rbd_user],
})
}
Concat::Fragment <<| title == 'ceph-client-os' |>> Concat::Fragment <<| title == 'ceph-client-os' |>>