diff options
Diffstat (limited to 'extraconfig/tasks/major_upgrade_pacemaker.yaml')
| -rw-r--r-- | extraconfig/tasks/major_upgrade_pacemaker.yaml | 39 |
1 files changed, 15 insertions, 24 deletions
diff --git a/extraconfig/tasks/major_upgrade_pacemaker.yaml b/extraconfig/tasks/major_upgrade_pacemaker.yaml index 5a11bae9..4af3186c 100644 --- a/extraconfig/tasks/major_upgrade_pacemaker.yaml +++ b/extraconfig/tasks/major_upgrade_pacemaker.yaml @@ -40,6 +40,7 @@ resources: params: UPGRADE_LEVEL_NOVA_COMPUTE: {get_param: UpgradeLevelNovaCompute} - get_file: pacemaker_common_functions.sh + - get_file: major_upgrade_pacemaker_migrations.sh - get_file: major_upgrade_controller_pacemaker_1.sh ControllerPacemakerUpgradeDeployment_Step1: @@ -49,46 +50,36 @@ resources: config: {get_resource: ControllerPacemakerUpgradeConfig_Step1} input_values: {get_param: input_values} - ControllerPacemakerUpgradeConfig_Step2: + BlockStorageUpgradeConfig: type: OS::Heat::SoftwareConfig + depends_on: ControllerPacemakerUpgradeDeployment_Step1 properties: group: script - config: - list_join: - - '' - - - get_file: pacemaker_common_functions.sh - - get_file: major_upgrade_controller_pacemaker_2.sh + config: {get_file: major_upgrade_block_storage.sh} - ControllerPacemakerUpgradeDeployment_Step2: + BlockStorageUpgradeDeployment: type: OS::Heat::SoftwareDeploymentGroup - depends_on: ControllerPacemakerUpgradeDeployment_Step1 properties: - servers: {get_param: controller_servers} - config: {get_resource: ControllerPacemakerUpgradeConfig_Step2} + servers: {get_param: blockstorage_servers} + config: {get_resource: BlockStorageUpgradeConfig} input_values: {get_param: input_values} - ComputeDeliverUpgradeConfig_Step3: + ControllerPacemakerUpgradeConfig_Step2: type: OS::Heat::SoftwareConfig properties: group: script config: list_join: - '' - - - str_replace: - template: | - #!/bin/bash - upgrade_level_nova_compute='UPGRADE_LEVEL_NOVA_COMPUTE' - params: - UPGRADE_LEVEL_NOVA_COMPUTE: {get_param: UpgradeLevelNovaCompute} - - get_file: pacemaker_common_functions.sh - - get_file: major_upgrade_compute.sh + - - get_file: pacemaker_common_functions.sh + - get_file: major_upgrade_pacemaker_migrations.sh + - get_file: major_upgrade_controller_pacemaker_2.sh - ComputeDeliverUpgradeConfigDeployment_Step3: + ControllerPacemakerUpgradeDeployment_Step2: type: OS::Heat::SoftwareDeploymentGroup - depends_on: ControllerPacemakerUpgradeDeployment_Step2 + depends_on: BlockStorageUpgradeDeployment properties: - servers: {get_param: compute_servers} - config: {get_resource: ComputeDeliverUpgradeConfig_Step3} + servers: {get_param: controller_servers} + config: {get_resource: ControllerPacemakerUpgradeConfig_Step2} input_values: {get_param: input_values} - |