From: Mathieu Bultel Date: Thu, 9 Feb 2017 09:10:52 +0000 (+0100) Subject: Apply post-upgrade step to not run puppet in post upgrade X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=a36cac39387fced4ae4a3a0cded097fcee95b035;p=apex-tripleo-heat-templates.git Apply post-upgrade step to not run puppet in post upgrade In the environment file: environments/major-upgrade-composable-steps.yaml we don't want to run puppet in certains roles in post upgrade because we need to make some extra tasks on this nodes and run puppet on converge step Change-Id: I38fc5772cdb4a7df7979beb2e7475c70f34076a7 (cherry picked from commit b3b04eb0d22d776902462811d54bcd270e0fab73) --- diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index a6b32ddb..b544e453 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