openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Make sure openstack services are dependent on openstack-core" into stable/mitaka

This commit is contained in:
Jenkins 2016-05-23 09:36:03 +00:00 committed by Gerrit Code Review
parent bf933b37e2 fae9b282c7
commit a7dcab68b7
2 changed files with 63 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
extraconfig/tasks/major_upgrade_pacemaker_migrations.sh
View File

@ -13,6 +13,42 @@
# been already applied, it should be possible to call the function
# again without damaging the deployment or failing the upgrade.
function add_missing_openstack_core_constraints {
# The CIBs are saved under /root as they might contain sensitive data
CIB="/root/migration.cib"
CIB_BACKUP="/root/backup.cib"
CIB_PUSH_NEEDED=n
rm -f "$CIB" "$CIB_BACKUP" || /bin/true
pcs cluster cib "$CIB"
cp "$CIB" "$CIB_BACKUP"
if ! pcs -f "$CIB" constraint --full | grep 'start openstack-sahara-api-clone then start openstack-sahara-engine-clone'; then
pcs -f "$CIB" constraint order start openstack-sahara-api-clone then start openstack-sahara-engine-clone
CIB_PUSH_NEEDED=y
fi
if ! pcs -f "$CIB" constraint --full | grep 'start openstack-core-clone then start openstack-ceilometer-notification-clone'; then
pcs -f "$CIB" constraint order start openstack-core-clone then start openstack-ceilometer-notification-clone
CIB_PUSH_NEEDED=y
fi
if ! pcs -f "$CIB" constraint --full | grep 'start openstack-aodh-evaluator-clone then start openstack-aodh-listener-clone'; then
pcs -f "$CIB" constraint order start openstack-aodh-evaluator-clone then start openstack-aodh-listener-clone
CIB_PUSH_NEEDED=y
fi
if pcs -f "$CIB" constraint --full | grep 'start openstack-core-clone then start openstack-heat-api-clone'; then
CID=$(pcs -f "$CIB" constraint --full | grep 'start openstack-core-clone then start openstack-heat-api-clone' | sed -e 's/.*id\://g' -e 's/)//g')
pcs -f "$CIB" constraint remove $CID
CIB_PUSH_NEEDED=y
fi
if [ "$CIB_PUSH_NEEDED" = 'y' ]; then
pcs cluster cib-push "$CIB"
fi
}
function remove_ceilometer_alarm {
if pcs status | grep openstack-ceilometer-alarm; then
# Disable pacemaker resources for ceilometer-alarms

36
puppet/manifests/overcloud_controller_pacemaker.pp
View File

@ -1380,6 +1380,15 @@ if hiera('step') >= 4 {
require => [Pacemaker::Resource::Service[$::sahara::params::api_service_name],
Pacemaker::Resource::Ocf['openstack-core']],
}
pacemaker::constraint::base { 'sahara-api-then-sahara-engine-constraint':
constraint_type => 'order',
first_resource => "${::sahara::params::api_service_name}-clone",
second_resource => "${::sahara::params::engine_service_name}-clone",
first_action => 'start',
second_action => 'start',
require => [Pacemaker::Resource::Service[$::sahara::params::api_service_name],
Pacemaker::Resource::Service[$::sahara::params::engine_service_name]],
}
# Glance
pacemaker::resource::service { $::glance::params::registry_service_name :
@ -1784,6 +1793,15 @@ if hiera('step') >= 4 {
require => [Pacemaker::Resource::Service[$::ceilometer::params::agent_central_service_name],
Pacemaker::Resource::Ocf['openstack-core']],
}
pacemaker::constraint::base { 'keystone-then-ceilometer-notification-constraint':
constraint_type => 'order',
first_resource => 'openstack-core-clone',
second_resource => "${::ceilometer::params::agent_notification_service_name}-clone",
first_action => 'start',
second_action => 'start',
require => [Pacemaker::Resource::Service[$::ceilometer::params::agent_central_service_name],
Pacemaker::Resource::Ocf['openstack-core']],
}
pacemaker::constraint::base { 'ceilometer-central-then-ceilometer-collector-constraint':
constraint_type => 'order',
first_resource => "${::ceilometer::params::agent_central_service_name}-clone",
@ -1867,6 +1885,15 @@ if hiera('step') >= 4 {
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",
@ -1923,15 +1950,6 @@ if hiera('step') >= 4 {
pacemaker::resource::service { $::heat::params::engine_service_name :
clone_params => 'interleave=true',
}
pacemaker::constraint::base { 'keystone-then-heat-api-constraint':
constraint_type => 'order',
first_resource => 'openstack-core-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::Ocf['openstack-core']],
}
pacemaker::constraint::base { 'heat-api-then-heat-api-cfn-constraint':
constraint_type => 'order',
first_resource => "${::heat::params::api_service_name}-clone",