Code Review / apex-tripleo-heat-templates.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | combined (merge: 8af47c2 a7b5689)
Merge "Add StackUpdateType to set hiera on upgrade"
authorJenkins <jenkins@review.openstack.org>
Fri, 5 May 2017 05:06:04 +0000 (05:06 +0000)
committerGerrit Code Review <review@openstack.org>
Fri, 5 May 2017 05:06:04 +0000 (05:06 +0000)
1  2 
environments/major-upgrade-converge-docker.yaml patch | diff1 | diff2 | blob | history
environments/major-upgrade-converge.yaml patch | diff1 | diff2 | blob | history

diff --cc environments/major-upgrade-converge-docker.yaml
index 0c32362,c4d05bd..163d1de
--- 1/environments/major-upgrade-converge-docker.yaml
--- 2/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 604e5a6,da06fed..d222fb8
--- 1/environments/major-upgrade-converge.yaml
--- 2/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: ''