diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-12-21 10:28:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-12-21 10:28:54 +0000 |
| commit | 6ec44d98b4a9aee3b469f31d08dd293bcff6db0e (patch) | |
| tree | 33d8191e2be2b1cbd46d168ca0e3af1819a39d8d /extraconfig/tasks/major_upgrade_pacemaker_init.j2.yaml | |
| parent | aed9e1b9c14058efc5fbdd41025fd688039ecf3b (diff) | |
| parent | afcb6e01f3af573a7bdd286a65b71eee48cec204 (diff) | |
Merge "Make the openvswitch 2.4->2.5 upgrade more robust"
Diffstat (limited to 'extraconfig/tasks/major_upgrade_pacemaker_init.j2.yaml')
| -rw-r--r-- | extraconfig/tasks/major_upgrade_pacemaker_init.j2.yaml | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/extraconfig/tasks/major_upgrade_pacemaker_init.j2.yaml b/extraconfig/tasks/major_upgrade_pacemaker_init.j2.yaml index f6aa3066..8e9cbdb4 100644 --- a/extraconfig/tasks/major_upgrade_pacemaker_init.j2.yaml +++ b/extraconfig/tasks/major_upgrade_pacemaker_init.j2.yaml @@ -54,19 +54,28 @@ resources: 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 ObjectStorageDeliverUpgradeScriptConfig: type: OS::Heat::SoftwareConfig properties: group: script - config: {get_file: major_upgrade_object_storage.sh} + config: + list_join: + - '' + - - get_file: pacemaker_common_functions.sh + - get_file: major_upgrade_object_storage.sh CephStorageDeliverUpgradeScriptConfig: type: OS::Heat::SoftwareConfig properties: group: script - config: {get_file: major_upgrade_ceph_storage.sh} + config: + list_join: + - '' + - - get_file: pacemaker_common_functions.sh + - get_file: major_upgrade_ceph_storage.sh {% for role in roles %} UpgradeInit{{role.name}}Deployment: |