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

diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp
index 0f3a5081b017e1ecb22b147f3b995596e30eb88e..f4ce50c699545af3edfcf41bab9a40691804cedd 100644 (file)
--- a/manifests/agent/compute.pp
+++ b/manifests/agent/compute.pp
@@ -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 {

diff --git a/manifests/agent/polling.pp b/manifests/agent/polling.pp
index 63317fd32ee5414a06c0a382e4a2a923287764eb..ab5f02ef042d7d59792e7385123fd99f376d2a99 100644 (file)
--- a/manifests/agent/polling.pp
+++ b/manifests/agent/polling.pp
@@ -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']
   }