From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 5 May 2017 05:06:04 +0000 (+0000)
Subject: Merge "Add StackUpdateType to set hiera on upgrade"
X-Git-Tag: opnfv-6.0.0~689
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=c577755082a92e638ca03ae8a8bd38045bf7901c;p=apex-tripleo-heat-templates.git

Merge "Add StackUpdateType to set hiera on upgrade"
---

c577755082a92e638ca03ae8a8bd38045bf7901c
diff --cc environments/major-upgrade-converge-docker.yaml
index 0c323621,c4d05bdb..163d1de4
--- a/environments/major-upgrade-converge-docker.yaml
+++ b/environments/major-upgrade-converge-docker.yaml
@@@ -4,6 -4,6 +4,7 @@@ resource_registry
    OS::TripleO::PostDeploySteps: ../docker/post.yaml
  parameter_defaults:
    EnableConfigPurge: false
+   StackUpdateType: ''
    UpgradeLevelNovaCompute: ''
    UpgradeInitCommonCommand: ''
 +  UpgradeInitCommand: ''
diff --cc environments/major-upgrade-converge.yaml
index 604e5a68,da06fed9..d222fb86
--- a/environments/major-upgrade-converge.yaml
+++ b/environments/major-upgrade-converge.yaml
@@@ -4,6 -4,6 +4,7 @@@ resource_registry
    OS::TripleO::PostDeploySteps: ../puppet/post.yaml
  parameter_defaults:
    EnableConfigPurge: false
+   StackUpdateType: ''
    UpgradeLevelNovaCompute: ''
    UpgradeInitCommonCommand: ''
 +  UpgradeInitCommand: ''