From 4a7a0d8879d94bacd985b7295210ac0480ea9a71 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Thu, 30 Jun 2016 07:29:04 -0400
Subject: Resolve duplicate base::ceilometer issues

We are seeing CI failures in Ia0a59121b9ffd5e07647f66137ce53870bc6b5d6
due to duplicate Tripleo::Profile::Base::Ceilometer.

Also, this patch gets the pacemaker_master variable out of the
'base' tree.

Change-Id: I2cf3362528235fcdeaef1491f86c05f4995938da
---
 manifests/profile/base/ceilometer/collector.pp | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'manifests/profile/base/ceilometer/collector.pp')

diff --git a/manifests/profile/base/ceilometer/collector.pp b/manifests/profile/base/ceilometer/collector.pp
index 6891f9c..34ee90b 100644
--- a/manifests/profile/base/ceilometer/collector.pp
+++ b/manifests/profile/base/ceilometer/collector.pp
@@ -33,9 +33,7 @@ class tripleo::profile::base::ceilometer::collector (
   $sync_db = true,
 ) {
 
-  class { '::tripleo::profile::base::ceilometer':
-    pacemaker_master => $sync_db,
-  }
+  include ::tripleo::profile::base::ceilometer
 
   if $step >= 3 and $sync_db {
     $ceilometer_backend = downcase(hiera('ceilometer_backend', 'mongodb'))
-- 
cgit 1.2.3-korg