Merge "Fix Ceilometer profiles"

2 files changed, 5 insertions, 41 deletions

diff --git a/manifests/profile/pacemaker/ceilometer.pp b/manifests/profile/pacemaker/ceilometer.pp
index 0c21807..23021fc 100644
--- a/manifests/profile/pacemaker/ceilometer.pp
+++ b/manifests/profile/pacemaker/ceilometer.pp
@@ -27,47 +27,18 @@
 #   for more details.
 #   Defaults to hiera('step')
 #
-# [*sync_db*]
-#   (Optional) Whether to run db sync
-#   Defaults to undef
-#
 class tripleo::profile::pacemaker::ceilometer (
   $bootstrap_node = hiera('bootstrap_nodeid'),
   $step           = hiera('step'),
-  $sync_db        = true,
 ) {
 
-  if $::hostname == downcase($bootstrap_node) {
-    $pacemaker_master = true
-  } else {
-    $pacemaker_master = false
-  }
-
   include ::tripleo::profile::base::ceilometer
 
-  if $step >= 5 and $pacemaker_master {
-    $ceilometer_backend = downcase(hiera('ceilometer_backend', 'mongodb'))
-    case $ceilometer_backend {
-      /mysql/: {
-        pacemaker::resource::service { $::ceilometer::params::agent_central_service_name:
-          clone_params => 'interleave=true',
-          require      => Pacemaker::Resource::Ocf['openstack-core'],
-        }
-      }
-      default: {
-        pacemaker::resource::service { $::ceilometer::params::agent_central_service_name:
-          clone_params => 'interleave=true',
-          require      => [Pacemaker::Resource::Ocf['openstack-core'],
-            Pacemaker::Resource::Service[$::mongodb::params::service_name]],
-        }
-      }
-    }
-
-    if $sync_db {
-      if $ceilometer_backend == 'mysql' {
-        class { '::ceilometer::db::mysql':
-          require => Exec['galera-ready'],
-        }
+  $ceilometer_backend = downcase(hiera('ceilometer_backend', 'mongodb'))
+  if $step >= 5 and $::hostname == downcase($bootstrap_node) {
+    if $ceilometer_backend == 'mysql' {
+      class { '::ceilometer::db::mysql':
+        require => Exec['galera-ready'],
       }
     }
 
diff --git a/manifests/profile/pacemaker/ceilometer/api.pp b/manifests/profile/pacemaker/ceilometer/api.pp
index cfe103a..3006be8 100644
--- a/manifests/profile/pacemaker/ceilometer/api.pp
+++ b/manifests/profile/pacemaker/ceilometer/api.pp
@@ -40,13 +40,6 @@ class tripleo::profile::pacemaker::ceilometer::api (
     pacemaker::resource::service { $::ceilometer::params::api_service_name :
       clone_params => 'interleave=true',
     }
-    pacemaker::constraint::colocation { 'ceilometer-delay-with-ceilometer-api-colocation':
-      source  => 'delay-clone',
-      target  => "${::ceilometer::params::api_service_name}-clone",
-      score   => 'INFINITY',
-      require => [Pacemaker::Resource::Service[$::ceilometer::params::api_service_name],
-        Pacemaker::Resource::Ocf['delay']],
-    }
   }
 
 }