openstack
/
puppet-ceilometer
Code Issues Proposed changes

puppet4: fix ordering for compute agent 

When managing the POSIX user for Ceilometer, we need to make sure
ceilometer-common and libvirt are installed before, otherwise catalog
will fail on Puppet4 with:

Error: Could not set groups on user[ceilometer]: Execution of
'/usr/sbin/usermod -G libvirtd,nova ceilometer' returned 6: usermod:
group 'libvirtd' does not exist

It's an orchestration issue, fixed by this patch.

Change-Id: I31daa60fa110bed68a30e576500f82ed69d30904
This commit is contained in:
Emilien Macchi 2016-08-12 10:40:24 -04:00
parent 0148969baf
commit 4833a7abe6
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifests/agent/compute.pp
View File

@ -40,11 +40,13 @@ class ceilometer::agent::compute (
User['ceilometer'] {
groups => ['nova', $::ceilometer::params::libvirt_group]
}
Package <| title == 'libvirt' |> -> User['ceilometer']
} else {
User['ceilometer'] {
groups => ['nova']
}
}
Package <| title == 'ceilometer-common' |> -> User['ceilometer']
if $manage_service {
if $enabled {

2
manifests/agent/polling.pp
View File

@ -53,6 +53,7 @@ class ceilometer::agent::polling (
User['ceilometer'] {
groups => ['nova', $::ceilometer::params::libvirt_group]
}
Package <| title == 'libvirt' |> -> User['ceilometer']
} else {
User['ceilometer'] {
groups => ['nova']
@ -61,6 +62,7 @@ class ceilometer::agent::polling (
$compute_namespace_name = 'compute'
Package <| title == 'ceilometer-common' |> -> User['ceilometer']
Package <| title == 'nova-common' |> -> Package['ceilometer-common']
}