Merge "Cleanup templates from the shared CephCluster config"

[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 17b64cb..9ebfb6d 100644 (file)
--- a/puppet/manifests/overcloud_controller_pacemaker.pp
+++ b/puppet/manifests/overcloud_controller_pacemaker.pp
@@ -87,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':
@@ -245,11 +240,6 @@ if hiera('step') >= 5 {
                   Pacemaker::Resource::Service[$::aodh::params::listener_service_name]],
     }
 
-    # The next step is to include this class in puppet-tripleo profiles directly.
-    # We couldn't do it directly in puppet-tripleo, otherwise CI would have break because
-    # of Puppet duplicated resource.
-    include ::tripleo::profile::pacemaker::apache
-
     #VSM
     if 'cisco_n1kv' in hiera('neutron::plugins::ml2::mechanism_drivers') {
       pacemaker::resource::ocf { 'vsm-p' :