From: marios <marios@redhat.com>
Date: Thu, 27 Apr 2017 13:51:42 +0000 (+0300)
Subject: Unset the UpgradeInitCommand on converge
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=cc9695e74e588a8aa35aa3850bb0b336906c78e0;p=apex-tripleo-heat-templates.git

Unset the UpgradeInitCommand on converge

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
(cherry picked from commit 7d87b8225bd640fee4b55fd66e793391526f6d54)
---

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: ''