diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-09-16 19:31:08 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-09-16 19:31:08 +0000 |
| commit | 1e92d33d96e0c5aa1b1b5a2678433e97bade803a (patch) | |
| tree | 33589a60df56bc8a18df3a5570f27bca5a3babe0 /extraconfig/tasks/major_upgrade_pacemaker.yaml | |
| parent | 124ea0fd58f6cf89eed70597ffc81abbf4679fb8 (diff) | |
| parent | 3a8d20a63dccc61c958e09a7fcbbaab6690551b4 (diff) | |
Merge "Convert UpdateWorkflow to support composable roles"
Diffstat (limited to 'extraconfig/tasks/major_upgrade_pacemaker.yaml')
| -rw-r--r-- | extraconfig/tasks/major_upgrade_pacemaker.yaml | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/extraconfig/tasks/major_upgrade_pacemaker.yaml b/extraconfig/tasks/major_upgrade_pacemaker.yaml index 9e14fe5d..e030ca05 100644 --- a/extraconfig/tasks/major_upgrade_pacemaker.yaml +++ b/extraconfig/tasks/major_upgrade_pacemaker.yaml @@ -2,15 +2,7 @@ heat_template_version: 2016-10-14 description: 'Upgrade for Pacemaker deployments' parameters: - controller_servers: - type: json - compute_servers: - type: json - blockstorage_servers: - type: json - objectstorage_servers: - type: json - cephstorage_servers: + servers: type: json input_values: type: json @@ -54,7 +46,7 @@ resources: CephMonUpgradeDeployment: type: OS::Heat::SoftwareDeploymentGroup properties: - servers: {get_param: controller_servers} + servers: {get_param: servers, Controller} config: {get_resource: CephMonUpgradeConfig} input_values: {get_param: input_values} update_policy: @@ -90,7 +82,7 @@ resources: type: OS::Heat::SoftwareDeploymentGroup depends_on: CephMonUpgradeDeployment properties: - servers: {get_param: controller_servers} + servers: {get_param: servers, Controller} config: {get_resource: ControllerPacemakerUpgradeConfig_Step1} input_values: {get_param: input_values} @@ -104,7 +96,7 @@ resources: BlockStorageUpgradeDeployment: type: OS::Heat::SoftwareDeploymentGroup properties: - servers: {get_param: blockstorage_servers} + servers: {get_param: servers, BlockStorage} config: {get_resource: BlockStorageUpgradeConfig} input_values: {get_param: input_values} @@ -123,7 +115,7 @@ resources: type: OS::Heat::SoftwareDeploymentGroup depends_on: BlockStorageUpgradeDeployment properties: - servers: {get_param: controller_servers} + servers: {get_param: servers, Controller} config: {get_resource: ControllerPacemakerUpgradeConfig_Step2} input_values: {get_param: input_values} |