From 08fc9d9159cd9eb0830d550abb1058bc2b9b5759 Mon Sep 17 00:00:00 2001 From: Chris Hoge Date: Wed, 1 Oct 2014 20:10:50 -0500 Subject: [PATCH] Ensure nova-common is installed before ceilometer Ceilometer depends on the nova user and group being present. This change adds a dependency to nova-common to ensure that packging will handle the user before the ceilometer compute agent tries to add user ceilometer to the nova group. Fixes bug 1350980 Change-Id: Iaf950c4a487b4b25c9053d59cab4fa45a1f7390b --- manifests/agent/compute.pp | 2 +- spec/classes/ceilometer_agent_compute_spec.rb | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp index 9a81e8c..3104836 100644 --- a/manifests/agent/compute.pp +++ b/manifests/agent/compute.pp @@ -43,7 +43,7 @@ class ceilometer::agent::compute ( } } - Package['ceilometer-common'] -> Service['ceilometer-agent-compute'] + Package['nova-common'] -> Package['ceilometer-common'] -> Service['ceilometer-agent-compute'] service { 'ceilometer-agent-compute': ensure => $service_ensure, name => $::ceilometer::params::agent_compute_service_name, diff --git a/spec/classes/ceilometer_agent_compute_spec.rb b/spec/classes/ceilometer_agent_compute_spec.rb index d193bc1..e68d91e 100644 --- a/spec/classes/ceilometer_agent_compute_spec.rb +++ b/spec/classes/ceilometer_agent_compute_spec.rb @@ -39,6 +39,12 @@ describe 'ceilometer::agent::compute' do ) end + it 'ensures nova-common is installed before the package ceilometer-common' do + should contain_package('nova-common').with( + :before => /Package\[ceilometer-common\]/ + ) + end + it 'configures nova notification driver' do should contain_file_line_after('nova-notification-driver-common').with( :line => 'notification_driver=nova.openstack.common.notifier.rpc_notifier', -- 2.45.2