Use UpgradeInitCommonCommand with deployed-server too

We've hit an issue in multinode CI that Ansible wasn't getting updated
during `upgrade prepare`. UpgradeInitCommonCommand wasn't being
executed because it was left out from deployed-server.yaml.

Change-Id: I940c3e05944829a6a4155722181e5fa85a963660
Closes-Bug: #1776474
This commit is contained in:
Jiri Stransky 2018-06-12 14:25:14 +02:00
parent c9d2ba055b
commit e8532bea1e

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