From: iberezovskiy <iberezovskiy@mirantis.com>
Date: Fri, 22 May 2015 09:39:48 +0000 (+0300)
Subject: Fix dependency on nova-common package
X-Git-Tag: 6.0.0~20
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=264ea1b19155bb2f34a95858b18442c14504ddf2;p=puppet-modules%2Fpuppet-ceilometer.git

Fix dependency on nova-common package

  Nova module could be not included or imported directly
  and this can lead to failure with missing dependency
  on 'nova-common' package. More safe is to use
  Package <| title == nova-common |>

Change-Id: Idac8d52955ff6f3f1c62a538b197eeac6f281a1f
---

diff --git a/manifests/agent/compute.pp b/manifests/agent/compute.pp
index 1c48c78..ec678b8 100644
--- a/manifests/agent/compute.pp
+++ b/manifests/agent/compute.pp
@@ -51,7 +51,7 @@ class ceilometer::agent::compute (
     }
   }
 
-  Package['nova-common'] -> Package['ceilometer-common'] -> Service['ceilometer-agent-compute']
+  Package <| title == '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/manifests/agent/polling.pp b/manifests/agent/polling.pp
index a4316af..0987420 100644
--- a/manifests/agent/polling.pp
+++ b/manifests/agent/polling.pp
@@ -83,7 +83,7 @@ class ceilometer::agent::polling (
 
     $compute_namespace_name = 'compute'
 
-    Package['nova-common'] -> Package['ceilometer-common']
+    Package <| title == 'nova-common' |> -> Package['ceilometer-common']
   }
 
   if $ipmi_namespace {