From: Chris Hoge <chris@hogepodge.com>
Date: Thu, 2 Oct 2014 01:10:50 +0000 (-0500)
Subject: Ensure nova-common is installed before ceilometer
X-Git-Tag: 4.2.0~2^2
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=f8fd9a713282f2228799d89c1bc614f04b488ef2;p=puppet-modules%2Fpuppet-ceilometer.git

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

(cherry picked from commit 08fc9d9159cd9eb0830d550abb1058bc2b9b5759)

Conflicts:
	spec/classes/ceilometer_agent_compute_spec.rb

Change-Id: I26dd4e8e4172d777a04d99c7d23c1861714ca079
---

diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp
index fde3705..cde19d6 100644
--- a/manifests/agent/compute.pp
+++ b/manifests/agent/compute.pp
@@ -36,7 +36,7 @@ class ceilometer::agent::compute (
     $service_ensure = 'stopped'
   }
 
-  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 16f19a0..eec04aa 100644
--- a/spec/classes/ceilometer_agent_compute_spec.rb
+++ b/spec/classes/ceilometer_agent_compute_spec.rb
@@ -48,6 +48,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',