diff options
| author |   marios <marios@redhat.com> | 2017-02-16 11:59:57 +0200 |
|---|---|---|
| committer | Marios Andreou <marios@redhat.com> | 2017-02-16 10:50:12 +0000 |
| commit | 01a91d37199f592aa4273e3847eb1f4f1d27da02 (patch) | |
| tree | 9e98754177136e5dd8bd84e0577a9bb895cdf97d /puppet/role.role.j2.yaml | |
| parent | 306390d6bc6978dc87d378809b62a49c156bc8cc (diff) | |
Add Newton to Ocata UpgradeInitCommonCommand
This adds the UpgradeInitCommonCommand for newton..ocata common
UpgradeInit commands. This comes before the ansible upgrade steps
so we need to do things like remove the old newton hieradata and
install the ansible-pacemaker module and ansible heat-agent plugin
This defaults to '' and is set in the major-upgrade-composable-steps
and unset in the major-upgrade-converge environment files.
Change-Id: I0c7a32194c0069b63a501a913c17907b47c9cc16
Diffstat (limited to 'puppet/role.role.j2.yaml')
| -rw-r--r-- | puppet/role.role.j2.yaml | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/puppet/role.role.j2.yaml b/puppet/role.role.j2.yaml index 2f070da2..2e1bd6f1 100644 --- a/puppet/role.role.j2.yaml +++ b/puppet/role.role.j2.yaml @@ -137,7 +137,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: {{role}}: @@ -386,6 +393,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 |