From e8532bea1e99c621f8410c1c15204f6ffdfaede6 Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Tue, 12 Jun 2018 14:25:14 +0200 Subject: [PATCH] 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 --- deployed-server/deployed-server.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/deployed-server/deployed-server.yaml b/deployed-server/deployed-server.yaml index 7fc1862c1d..2f7d975b96 100644 --- a/deployed-server/deployed-server.yaml +++ b/deployed-server/deployed-server.yaml @@ -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