From 331bc1bc8310003eae1299ded55662e3b13473aa Mon Sep 17 00:00:00 2001
From: Lars Kellogg-Stedman <lars@redhat.com>
Date: Wed, 26 Mar 2014 14:31:41 -0400
Subject: [PATCH] mongodb/ceilmoneter manifests cannot depend on eachother

since mongodb and ceilometer classes are in separate manifests, possibly
on different hosts, they cannot depend on classes realized in the other
manifest.

Change-Id: I3710270900733705ce5ed052a52a2996d96f8756
Closes-bug: 1297995
---
 packstack/puppet/templates/ceilometer.pp | 3 ---
 packstack/puppet/templates/mongodb.pp    | 1 -
 2 files changed, 4 deletions(-)

diff --git a/packstack/puppet/templates/ceilometer.pp b/packstack/puppet/templates/ceilometer.pp
index 1c8afc01b..7bf6766c3 100644
--- a/packstack/puppet/templates/ceilometer.pp
+++ b/packstack/puppet/templates/ceilometer.pp
@@ -1,10 +1,8 @@
 class { 'ceilometer::db':
     database_connection => 'mongodb://%(CONFIG_MONGODB_HOST)s:27017/ceilometer',
-    require             => Class['mongodb::server'],
 }
 
 class { 'ceilometer::collector':
-    require => Class['mongodb::server'],
 }
 
 class { 'ceilometer::agent::auth':
@@ -24,5 +22,4 @@ class { 'ceilometer::alarm::evaluator':
 class { 'ceilometer::api':
     keystone_host     => '%(CONFIG_KEYSTONE_HOST)s',
     keystone_password => '%(CONFIG_CEILOMETER_KS_PW)s',
-    require           => Class['mongodb::server'],
 }
diff --git a/packstack/puppet/templates/mongodb.pp b/packstack/puppet/templates/mongodb.pp
index f8a1738ec..490ce4ba1 100644
--- a/packstack/puppet/templates/mongodb.pp
+++ b/packstack/puppet/templates/mongodb.pp
@@ -1,5 +1,4 @@
 class { 'mongodb::server':
     smallfiles   => true,
     bind_ip      => ['%(CONFIG_MONGODB_HOST)s'],
-    before       => Class['ceilometer::db'],
 }