X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fmanifests%2Fovercloud_controller_pacemaker.pp;h=d329d5fcbf430432c243ae6c6a44cc191b18b58d;hb=b4cd2ed1ee0f5eb86d0cba75ed40d4679210e616;hp=709d9968557c7cf821426f3e7d232507293fc882;hpb=dfcfb9d4de5ecc4b624ea4497718cb98e80b2d7e;p=apex-tripleo-heat-templates.git

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 709d9968..d329d5fc 100644
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -13,130 +13,9 @@
 # License for the specific language governing permissions and limitations
 # under the License.
 
-# TODO(jistr): use pcs resource provider instead of just no-ops
-Service <|
-  tag == 'aodh-service'
-|> {
-  hasrestart => true,
-  restart    => '/bin/true',
-  start      => '/bin/true',
-  stop       => '/bin/true',
+if hiera('step') >= 4 {
+  hiera_include('controller_classes', [])
 }
 
-include ::tripleo::packages
-include ::tripleo::firewall
-
-if $::hostname == downcase(hiera('bootstrap_nodeid')) {
-  $pacemaker_master = true
-  $sync_db = true
-} else {
-  $pacemaker_master = false
-  $sync_db = false
-}
-
-if hiera('step') >= 2 {
-  if $pacemaker_master {
-    class { '::aodh::db::mysql':
-        require => Exec['galera-ready'],
-    }
-  }
-} #END STEP 2
-
-if hiera('step') >= 4 or ( hiera('step') >= 3 and $sync_db ) {
-  # Aodh
-  class { '::aodh' :
-    database_connection => hiera('aodh_mysql_conn_string'),
-  }
-  include ::aodh::config
-  include ::aodh::auth
-  include ::aodh::client
-  include ::aodh::wsgi::apache
-  class { '::aodh::api':
-    manage_service => false,
-    enabled        => false,
-    service_name   => 'httpd',
-  }
-  class { '::aodh::evaluator':
-    manage_service => false,
-    enabled        => false,
-  }
-  class { '::aodh::notifier':
-    manage_service => false,
-    enabled        => false,
-  }
-  class { '::aodh::listener':
-    manage_service => false,
-    enabled        => false,
-  }
-
-  hiera_include('controller_classes')
-
-} #END STEP 4
-
-if hiera('step') >= 5 {
-  if $pacemaker_master {
-
-    # Fedora doesn't know `require-all` parameter for constraints yet
-    if $::operatingsystem == 'Fedora' {
-      $redis_aodh_constraint_params = undef
-    } else {
-      $redis_aodh_constraint_params = 'require-all=false'
-    }
-    pacemaker::constraint::base { 'redis-then-aodh-evaluator-constraint':
-      constraint_type   => 'order',
-      first_resource    => 'redis-master',
-      second_resource   => "${::aodh::params::evaluator_service_name}-clone",
-      first_action      => 'promote',
-      second_action     => 'start',
-      constraint_params => $redis_aodh_constraint_params,
-      require           => [Pacemaker::Resource::Ocf['redis'],
-                            Pacemaker::Resource::Service[$::aodh::params::evaluator_service_name]],
-    }
-    # Aodh
-    pacemaker::resource::service { $::aodh::params::evaluator_service_name :
-      clone_params => 'interleave=true',
-    }
-    pacemaker::resource::service { $::aodh::params::notifier_service_name :
-      clone_params => 'interleave=true',
-    }
-    pacemaker::resource::service { $::aodh::params::listener_service_name :
-      clone_params => 'interleave=true',
-    }
-    pacemaker::constraint::base { 'aodh-evaluator-then-aodh-notifier-constraint':
-      constraint_type => 'order',
-      first_resource  => "${::aodh::params::evaluator_service_name}-clone",
-      second_resource => "${::aodh::params::notifier_service_name}-clone",
-      first_action    => 'start',
-      second_action   => 'start',
-      require         => [Pacemaker::Resource::Service[$::aodh::params::evaluator_service_name],
-                          Pacemaker::Resource::Service[$::aodh::params::notifier_service_name]],
-    }
-    pacemaker::constraint::colocation { 'aodh-notifier-with-aodh-evaluator-colocation':
-      source  => "${::aodh::params::notifier_service_name}-clone",
-      target  => "${::aodh::params::evaluator_service_name}-clone",
-      score   => 'INFINITY',
-      require => [Pacemaker::Resource::Service[$::aodh::params::evaluator_service_name],
-                  Pacemaker::Resource::Service[$::aodh::params::notifier_service_name]],
-    }
-    pacemaker::constraint::base { 'aodh-evaluator-then-aodh-listener-constraint':
-      constraint_type => 'order',
-      first_resource  => "${::aodh::params::evaluator_service_name}-clone",
-      second_resource => "${::aodh::params::listener_service_name}-clone",
-      first_action    => 'start',
-      second_action   => 'start',
-      require         => [Pacemaker::Resource::Service[$::aodh::params::evaluator_service_name],
-                          Pacemaker::Resource::Service[$::aodh::params::listener_service_name]],
-    }
-    pacemaker::constraint::colocation { 'aodh-listener-with-aodh-evaluator-colocation':
-      source  => "${::aodh::params::listener_service_name}-clone",
-      target  => "${::aodh::params::evaluator_service_name}-clone",
-      score   => 'INFINITY',
-      require => [Pacemaker::Resource::Service[$::aodh::params::evaluator_service_name],
-                  Pacemaker::Resource::Service[$::aodh::params::listener_service_name]],
-    }
-  }
-
-} #END STEP 5
-
 $package_manifest_name = join(['/var/lib/tripleo/installed-packages/overcloud_controller_pacemaker', hiera('step')])
 package_manifest{$package_manifest_name: ensure => present}