summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-28 14:23:39 +0000
committerGerrit Code Review <review@openstack.org>2017-04-28 14:23:39 +0000
commit7e71e0b4127669413aeedf3990e80bcafdcf4231 (patch)
tree0b6877f48f88ad752ff3e89097ccbdac4b9b4af1
parent20b10bb179d4e5397ea1a15f9d66e098bda1c357 (diff)
parent7d87b8225bd640fee4b55fd66e793391526f6d54 (diff)
Merge "Unset the UpgradeInitCommand on converge"
-rw-r--r--environments/major-upgrade-converge-docker.yaml1
-rw-r--r--environments/major-upgrade-converge.yaml1
2 files changed, 2 insertions, 0 deletions
diff --git a/environments/major-upgrade-converge-docker.yaml b/environments/major-upgrade-converge-docker.yaml
index a3816b50..0c323621 100644
--- 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 4e8bf46b..604e5a68 100644
--- a/environments/major-upgrade-converge.yaml
+++ b/environments/major-upgrade-converge.yaml
@@ -6,3 +6,4 @@ parameter_defaults:
EnableConfigPurge: false
UpgradeLevelNovaCompute: ''
UpgradeInitCommonCommand: ''
+ UpgradeInitCommand: ''