diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-29 14:56:41 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-29 14:56:41 +0000 |
| commit | 6fadcce8682bd37eb9698ac0b6bac0087fde7955 (patch) | |
| tree | b16dd7b2a118eb6798e8de1d13a4657719322656 /extraconfig/tasks/major_upgrade_pacemaker.yaml | |
| parent | 77480ec29c1a8b520bd895fb3fe0c6a0f4da120b (diff) | |
| parent | ad07a29f9474ef68d0edf218638fe6030c019629 (diff) | |
Merge "Fix races in major-upgrade-pacemaker Step2"
Diffstat (limited to 'extraconfig/tasks/major_upgrade_pacemaker.yaml')
| -rw-r--r-- | extraconfig/tasks/major_upgrade_pacemaker.yaml | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/extraconfig/tasks/major_upgrade_pacemaker.yaml b/extraconfig/tasks/major_upgrade_pacemaker.yaml index a2a1bb5d..30ae8d1e 100644 --- a/extraconfig/tasks/major_upgrade_pacemaker.yaml +++ b/extraconfig/tasks/major_upgrade_pacemaker.yaml @@ -120,3 +120,22 @@ resources: config: {get_resource: ControllerPacemakerUpgradeConfig_Step2} input_values: {get_param: input_values} + ControllerPacemakerUpgradeConfig_Step3: + type: OS::Heat::SoftwareConfig + properties: + group: script + config: + list_join: + - '' + - - get_file: pacemaker_common_functions.sh + - get_file: major_upgrade_pacemaker_migrations.sh + - get_file: major_upgrade_controller_pacemaker_3.sh + + ControllerPacemakerUpgradeDeployment_Step3: + type: OS::Heat::SoftwareDeploymentGroup + depends_on: ControllerPacemakerUpgradeDeployment_Step2 + properties: + servers: {get_param: [servers, Controller]} + config: {get_resource: ControllerPacemakerUpgradeConfig_Step3} + input_values: {get_param: input_values} + |