stackforge/puppet-openstack-cloud
Code Issues Proposed changes

hypervisor: use stdlib for cinder ceph key

Browse Source 
To avoid resource dupplication errors in Puppet, we use here stdlib and
ensure_resource, to allow us to declare on the same node a Cinder volume
server with RBD driver and a compute using Ceph also.

Bug #402
This commit is contained in:
Emilien Macchi 2014-04-10 23:35:49 +02:00
parent 16f4132f67
commit 9a44bacecc
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/compute/hypervisor.pp
View File

@ -142,12 +142,13 @@ 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 |>>
file { "/etc/ceph/ceph.client.${cinder_rbd_user}.keyring":
ensure_resource('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' |>>
} else { } else {
$libvirt_disk_cachemodes_real = [] $libvirt_disk_cachemodes_real = []