7 files changed, 11 insertions, 67 deletions
diff --git a/manifests/profile/base/aodh/api.pp b/manifests/profile/base/aodh/api.pp
index 19ecfaf..3c4c0b6 100644
--- a/manifests/profile/base/aodh/api.pp
+++ b/manifests/profile/base/aodh/api.pp
@@ -23,21 +23,10 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*bootstrap_node*]
-#   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
-#
 class tripleo::profile::base::aodh::api (
-  $step           = hiera('step'),
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $step = hiera('step'),
 ) {
 
-  if $::hostname == downcase($bootstrap_node) {
-    $sync_db = true
-  } else {
-    $sync_db = false
-  }
-
   include ::tripleo::profile::base::aodh
 
   if $step >= 4 {
diff --git a/manifests/profile/base/aodh/evaluator.pp b/manifests/profile/base/aodh/evaluator.pp
index ca506bc..610d5a8 100644
--- a/manifests/profile/base/aodh/evaluator.pp
+++ b/manifests/profile/base/aodh/evaluator.pp
@@ -23,21 +23,10 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*bootstrap_node*]
-#   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
-#
 class tripleo::profile::base::aodh::evaluator (
-  $step           = hiera('step'),
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $step = hiera('step'),
 ) {
 
-  if $::hostname == downcase($bootstrap_node) {
-    $sync_db = true
-  } else {
-    $sync_db = false
-  }
-
   include ::tripleo::profile::base::aodh
 
   if $step >= 4 {
diff --git a/manifests/profile/base/aodh/listener.pp b/manifests/profile/base/aodh/listener.pp
index 57ad27f..d36e1bb 100644
--- a/manifests/profile/base/aodh/listener.pp
+++ b/manifests/profile/base/aodh/listener.pp
@@ -23,21 +23,10 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*bootstrap_node*]
-#   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
-#
 class tripleo::profile::base::aodh::listener (
-  $step           = hiera('step'),
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $step = hiera('step'),
 ) {
 
-  if $::hostname == downcase($bootstrap_node) {
-    $sync_db = true
-  } else {
-    $sync_db = false
-  }
-
   include ::tripleo::profile::base::aodh
 
   if $step >= 4 {
diff --git a/manifests/profile/base/aodh/notifier.pp b/manifests/profile/base/aodh/notifier.pp
index 03a0a6f..d2a3945 100644
--- a/manifests/profile/base/aodh/notifier.pp
+++ b/manifests/profile/base/aodh/notifier.pp
@@ -23,21 +23,10 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*bootstrap_node*]
-#   (Optional) The hostname of the node responsible for bootstrapping tasks
-#   Defaults to hiera('bootstrap_nodeid')
-#
 class tripleo::profile::base::aodh::notifier (
-  $step           = hiera('step'),
-  $bootstrap_node = hiera('bootstrap_nodeid', undef),
+  $step = hiera('step'),
 ) {
 
-  if $::hostname == downcase($bootstrap_node) {
-    $sync_db = true
-  } else {
-    $sync_db = false
-  }
-
   include ::tripleo::profile::base::aodh
 
   if $step >= 4 {
diff --git a/manifests/profile/base/ceilometer/api.pp b/manifests/profile/base/ceilometer/api.pp
index b300a91..b6419c2 100644
--- a/manifests/profile/base/ceilometer/api.pp
+++ b/manifests/profile/base/ceilometer/api.pp
@@ -30,6 +30,9 @@ class tripleo::profile::base::ceilometer::api (
 
   if $step >= 4 {
     include ::ceilometer::api
+    #NOTE: remove conditional once tht changes are merged
+    if hiera('ceilometer_wsgi', false) {
+      include ::ceilometer::wsgi::apache
+    }
   }
-
 }
diff --git a/manifests/profile/pacemaker/ceilometer.pp b/manifests/profile/pacemaker/ceilometer.pp
index 531b4bc..a31128d 100644
--- a/manifests/profile/pacemaker/ceilometer.pp
+++ b/manifests/profile/pacemaker/ceilometer.pp
@@ -87,22 +87,6 @@ class tripleo::profile::pacemaker::ceilometer (
       require         => [Pacemaker::Resource::Service[$::ceilometer::params::agent_central_service_name],
                           Pacemaker::Resource::Service[$::ceilometer::params::collector_service_name]],
     }
-    pacemaker::constraint::base { 'ceilometer-collector-then-ceilometer-api-constraint':
-      constraint_type => 'order',
-      first_resource  => "${::ceilometer::params::collector_service_name}-clone",
-      second_resource => "${::ceilometer::params::api_service_name}-clone",
-      first_action    => 'start',
-      second_action   => 'start',
-      require         => [Pacemaker::Resource::Service[$::ceilometer::params::collector_service_name],
-                          Pacemaker::Resource::Service[$::ceilometer::params::api_service_name]],
-    }
-    pacemaker::constraint::colocation { 'ceilometer-api-with-ceilometer-collector-colocation':
-      source  => "${::ceilometer::params::api_service_name}-clone",
-      target  => "${::ceilometer::params::collector_service_name}-clone",
-      score   => 'INFINITY',
-      require => [Pacemaker::Resource::Service[$::ceilometer::params::api_service_name],
-                  Pacemaker::Resource::Service[$::ceilometer::params::collector_service_name]],
-    }
   }
 
 }
diff --git a/manifests/profile/pacemaker/ceilometer/api.pp b/manifests/profile/pacemaker/ceilometer/api.pp
index 0eddaec..169121b 100644
--- a/manifests/profile/pacemaker/ceilometer/api.pp
+++ b/manifests/profile/pacemaker/ceilometer/api.pp
@@ -34,10 +34,11 @@ class tripleo::profile::pacemaker::ceilometer::api (
   include ::ceilometer::params
   include ::tripleo::profile::pacemaker::ceilometer
   include ::tripleo::profile::base::ceilometer::api
+  include ::tripleo::profile::pacemaker::apache
 
   if $step >= 5 and downcase($::hostname) == $pacemaker_master {
-    pacemaker::resource::service { $::ceilometer::params::api_service_name :
-      clone_params => 'interleave=true',
+    class { '::tripleo::profile::base::ceilometer::api':
+      step    => $step,
     }
   }