Merge "Explicitly set nova and neutron host on controllers"

[apex-tripleo-heat-templates.git] / puppet / manifests / overcloud_controller_pacemaker.pp

diff --git a/puppet/manifests/overcloud_controller_pacemaker.pp b/puppet/manifests/overcloud_controller_pacemaker.pp
index 39d176a..9ebfb6d 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -15,8 +15,7 @@
 
 # TODO(jistr): use pcs resource provider instead of just no-ops
 Service <|
-  tag == 'aodh-service' or
-  tag == 'gnocchi-service'
+  tag == 'aodh-service'
 |> {
   hasrestart => true,
   restart    => '/bin/true',
@@ -88,11 +87,6 @@ if hiera('step') >= 4 or ( hiera('step') >= 3 and $sync_db ) {
 } #END STEP 4
 
 if hiera('step') >= 5 {
-  $nova_enable_db_purge = hiera('nova_enable_db_purge', true)
-  if $nova_enable_db_purge {
-    include ::nova::cron::archive_deleted_rows
-  }
-
   if $pacemaker_master {
 
     pacemaker::constraint::base { 'openstack-core-then-httpd-constraint':
@@ -246,15 +240,6 @@ if hiera('step') >= 5 {
                   Pacemaker::Resource::Service[$::aodh::params::listener_service_name]],
     }
 
-    # Horizon and Keystone
-    pacemaker::resource::service { $::apache::params::service_name:
-      clone_params     => 'interleave=true',
-      verify_on_create => true,
-      require          => [File['/etc/keystone/ssl/certs/ca.pem'],
-      File['/etc/keystone/ssl/private/signing_key.pem'],
-      File['/etc/keystone/ssl/certs/signing_cert.pem']],
-    }
-
     #VSM
     if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') {
       pacemaker::resource::ocf { 'vsm-p' :