diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-02-18 02:04:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-02-18 02:04:40 +0000 |
| commit | edbaaa9e8546a60c6a95095fe174281410cfb009 (patch) | |
| tree | d27b5013aef1df0a8a71b5cc8ea32ac0423adba7 | |
| parent | 2da48b89b0fb7157ec567bd4fe677b47ca0cca49 (diff) | |
| parent | a36cac39387fced4ae4a3a0cded097fcee95b035 (diff) | |
Merge "Apply post-upgrade step to not run puppet in post upgrade" into stable/ocata
| -rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 2 |
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 |