Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (from parent 1: c9d758c)
Unset the UpgradeInitCommand on converge
authormarios <marios@redhat.com>
Thu, 27 Apr 2017 13:51:42 +0000 (16:51 +0300)
committermarios <marios@redhat.com>
Fri, 28 Apr 2017 10:35:23 +0000 (13:35 +0300)
In the converge envs we unset the UpgradeInitCommon since we used
that for the N..O upgrades workflow. However an operator may have
also overridden the UpgradeInitCommand so we should unset that
too.

Closes-Bug: 1686918
Change-Id: I3b316d04b78a4ab1e3f9f69948e42e6fb0ad6632

environments/major-upgrade-converge-docker.yaml patch | blob | history
environments/major-upgrade-converge.yaml patch | blob | history

diff --git a/environments/major-upgrade-converge-docker.yaml b/environments/major-upgrade-converge-docker.yaml
index a3816b5..0c32362 100644 (file)
--- a/environments/major-upgrade-converge-docker.yaml
+++ b/environments/major-upgrade-converge-docker.yaml
@@ -6,3 +6,4 @@ parameter_defaults:
   EnableConfigPurge: false
   UpgradeLevelNovaCompute: ''
   UpgradeInitCommonCommand: ''
+  UpgradeInitCommand: ''
diff --git a/environments/major-upgrade-converge.yaml b/environments/major-upgrade-converge.yaml
index 4e8bf46..604e5a6 100644 (file)
--- a/environments/major-upgrade-converge.yaml
+++ b/environments/major-upgrade-converge.yaml
@@ -6,3 +6,4 @@ parameter_defaults:
   EnableConfigPurge: false
   UpgradeLevelNovaCompute: ''
   UpgradeInitCommonCommand: ''
+  UpgradeInitCommand: ''