diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-17 01:22:44 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-17 01:22:44 +0000 |
| commit | eda5be6b5aedaa2957d931d05fcc040b059935d0 (patch) | |
| tree | 5805d09a6334f0d7d1be2b459d4f7ee10c60aed9 /puppet/objectstorage-role.yaml | |
| parent | 1c17ba2322f4a736e2f724b787c043ac474a2932 (diff) | |
| parent | 01a91d37199f592aa4273e3847eb1f4f1d27da02 (diff) | |
Merge "Add Newton to Ocata UpgradeInitCommonCommand"
Diffstat (limited to 'puppet/objectstorage-role.yaml')
| -rw-r--r-- | puppet/objectstorage-role.yaml | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/puppet/objectstorage-role.yaml b/puppet/objectstorage-role.yaml index 1633134d..172484dc 100644 --- a/puppet/objectstorage-role.yaml +++ b/puppet/objectstorage-role.yaml @@ -115,6 +115,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: '' resources: @@ -360,6 +368,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 # Note we may be able to make this conditional on UpgradeInitCommandNotEmpty # but https://bugs.launchpad.net/heat/+bug/1649900 needs fixing first |