summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-17 01:23:11 +0000
committerGerrit Code Review <review@openstack.org>2017-02-17 01:23:11 +0000
commit1c486d57a89ed37b435bd344175301caaa32a489 (patch)
treed2c14eb4ba196c611484d88853e7896fac962be5
parenteda5be6b5aedaa2957d931d05fcc040b059935d0 (diff)
parentb3b04eb0d22d776902462811d54bcd270e0fab73 (diff)
Merge "Apply post-upgrade step to not run puppet in post upgrade"
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index f2eb5267..9a8de34a 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -2,7 +2,7 @@ resource_registry:
OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment
OS::TripleO::PostDeploySteps: puppet/post.yaml
- OS::TripleO::PostUpgradeSteps: puppet/post.yaml
+ OS::TripleO::PostUpgradeSteps: puppet/post-upgrade.yaml
OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml
OS::TripleO::Hosts::SoftwareConfig: hosts-config.yaml
OS::TripleO::DefaultPasswords: default_passwords.yaml