openstack/tripleo-heat-templates
Code Issues Proposed changes

Merge "Add Heat as a Pacemaker resource"

Browse Source
This commit is contained in:
Jenkins 2015-06-01 07:45:26 +00:00 committed by Gerrit Code Review
commit 0c63d2be82
1 changed files with 79 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

87
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -657,20 +657,20 @@ if hiera('step') >= 3 {
sync_db => $sync_db,
}
class { '::heat::api' :
manage_service => $non_pcmk_start,
enabled => $non_pcmk_start,
manage_service => false,
enabled => false,
}
class { '::heat::api_cfn' :
manage_service => $non_pcmk_start,
enabled => $non_pcmk_start,
manage_service => false,
enabled => false,
}
class { '::heat::api_cloudwatch' :
manage_service => $non_pcmk_start,
enabled => $non_pcmk_start,
manage_service => false,
enabled => false,
}
class { '::heat::engine' :
manage_service => $non_pcmk_start,
enabled => $non_pcmk_start,
manage_service => false,
enabled => false,
}
# Horizon
@ -1168,6 +1168,77 @@ if hiera('step') >= 4 {
Pacemaker::Resource::Service[$::keystone::params::service_name]],
}
# Heat
pacemaker::resource::service { $::heat::params::api_service_name :
clone_params => 'interleave=true',
}
pacemaker::resource::service { $::heat::params::api_cloudwatch_service_name :
clone_params => 'interleave=true',
}
pacemaker::resource::service { $::heat::params::api_cfn_service_name :
clone_params => 'interleave=true',
}
pacemaker::resource::service { $::heat::params::engine_service_name :
clone_params => 'interleave=true',
}
pacemaker::constraint::base { 'heat-api-then-heat-api-cfn-constraint':
constraint_type => 'order',
first_resource => "${::heat::params::api_service_name}-clone",
second_resource => "${::heat::params::api_cfn_service_name}-clone",
first_action => 'start',
second_action => 'start',
require => [Pacemaker::Resource::Service[$::heat::params::api_service_name],
Pacemaker::Resource::Service[$::heat::params::api_cfn_service_name]],
}
pacemaker::constraint::colocation { 'heat-api-cfn-with-heat-api-colocation':
source => "${::heat::params::api_cfn_service_name}-clone",
target => "${::heat::params::api_service_name}-clone",
score => 'INFINITY',
require => [Pacemaker::Resource::Service[$::heat::params::api_cfn_service_name],
Pacemaker::Resource::Service[$::heat::params::api_service_name]],
}
pacemaker::constraint::base { 'heat-api-cfn-then-heat-api-cloudwatch-constraint':
constraint_type => 'order',
first_resource => "${::heat::params::api_cfn_service_name}-clone",
second_resource => "${::heat::params::api_cloudwatch_service_name}-clone",
first_action => 'start',
second_action => 'start',
require => [Pacemaker::Resource::Service[$::heat::params::api_cloudwatch_service_name],
Pacemaker::Resource::Service[$::heat::params::api_cfn_service_name]],
}
pacemaker::constraint::colocation { 'heat-api-cloudwatch-with-heat-api-cfn-colocation':
source => "${::heat::params::api_cloudwatch_service_name}-clone",
target => "${::heat::params::api_cfn_service_name}-clone",
score => 'INFINITY',
require => [Pacemaker::Resource::Service[$::heat::params::api_cfn_service_name],
Pacemaker::Resource::Service[$::heat::params::api_cloudwatch_service_name]],
}
pacemaker::constraint::base { 'heat-api-cloudwatch-then-heat-engine-constraint':
constraint_type => 'order',
first_resource => "${::heat::params::api_cloudwatch_service_name}-clone",
second_resource => "${::heat::params::engine_service_name}-clone",
first_action => 'start',
second_action => 'start',
require => [Pacemaker::Resource::Service[$::heat::params::api_cloudwatch_service_name],
Pacemaker::Resource::Service[$::heat::params::engine_service_name]],
}
pacemaker::constraint::colocation { 'heat-engine-with-heat-api-cloudwatch-colocation':
source => "${::heat::params::engine_service_name}-clone",
target => "${::heat::params::api_cloudwatch_service_name}-clone",
score => 'INFINITY',
require => [Pacemaker::Resource::Service[$::heat::params::api_cloudwatch_service_name],
Pacemaker::Resource::Service[$::heat::params::engine_service_name]],
}
pacemaker::constraint::base { 'ceilometer-notification-then-heat-api-constraint':
constraint_type => 'order',
first_resource => "${::ceilometer::params::agent_notification_service_name}-clone",
second_resource => "${::heat::params::api_service_name}-clone",
first_action => 'start',
second_action => 'start',
require => [Pacemaker::Resource::Service[$::heat::params::api_service_name],
Pacemaker::Resource::Service[$::ceilometer::params::agent_notification_service_name]],
}
}
} #END STEP 4