Merge "Use UpgradeInitCommonCommand with deployed-server too" into stable/queens

This commit is contained in:
Zuul 2018-06-20 16:40:00 +00:00 committed by Gerrit Code Review
commit c128be7a0b
1 changed files with 9 additions and 0 deletions

View File

@ -45,6 +45,14 @@ parameters:
Command or script snippet to run on all overcloud nodes to
initialize the upgrade process. E.g. a repository switch.
default: ''
UpgradeInitCommonCommand:
type: string
description: |
Common commands required by the upgrades process. This should not
normally be modified by the operator and is set and unset in the
major-upgrade-composable-steps.yaml and major-upgrade-converge.yaml
environment files.
default: ''
deployment_swift_data:
type: json
default: {}
@ -71,6 +79,7 @@ resources:
- - "#!/bin/bash\n\n"
- "if [[ -f /etc/resolv.conf.save ]] ; then rm /etc/resolv.conf.save; fi\n\n"
- get_param: UpgradeInitCommand
- get_param: UpgradeInitCommonCommand
UpgradeInitDeployment:
type: OS::Heat::SoftwareDeployment