From 7c502ce91dedfb75863f54105121e9c78dd89def Mon Sep 17 00:00:00 2001
From: Pradeep Kilambi <pkilambi@redhat.com>
Date: Thu, 23 Jun 2016 15:54:06 -0400
Subject: Add Aodh composable roles

Implements: blueprint composable-services-within-roles
Depends-On: Ie48a123cc5bc402aee635a5daf118b158c6f3b6a
Closes-Bug: #1601850

Change-Id: Ifcfe0e3937fa8577635d803d46c3dfc2e873e553
---
 puppet/manifests/overcloud_controller.pp | 21 ---------------------
 1 file changed, 21 deletions(-)

(limited to 'puppet/manifests/overcloud_controller.pp')

diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 067207f2..69e48e95 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -16,29 +16,8 @@
 include ::tripleo::packages
 include ::tripleo::firewall
 
-if hiera('step') >= 2 {
-  # FIXME: this should only occur on the bootstrap host (ditto for db syncs)
-  # Create all the database schemas
-  include ::aodh::db::mysql
-
-} #END STEP 2
-
 if hiera('step') >= 4 {
-  # Aodh
-  class { '::aodh' :
-    database_connection => hiera('aodh_mysql_conn_string'),
-  }
-  include ::aodh::db::sync
-  include ::aodh::auth
-  include ::aodh::api
-  include ::aodh::wsgi::apache
-  include ::aodh::evaluator
-  include ::aodh::notifier
-  include ::aodh::listener
-  include ::aodh::client
-
   hiera_include('controller_classes')
-
 } #END STEP 4
 
 $package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller', hiera('step')])
-- 
cgit 1.2.3-korg