diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-08-12 07:18:07 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-08-12 07:18:07 +0000 |
| commit | ac16b57460c407a6320f4c784dc7512070a4e4f4 (patch) | |
| tree | cb0ebcffc3935b60c163b2a38997bf8269cbf031 /overcloud-resource-registry-puppet.j2.yaml | |
| parent | 19855864b0ebac260ba520f13515577857c67f44 (diff) | |
| parent | 7f6305980df5427fd23c9c5b1b0307b1249945f6 (diff) | |
Merge "Consolidate puppet/docker deployments with one deploy steps workflow"
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
| -rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 0b4b4feb..fdf3bf6a 100644 --- a/overcloud-resource-registry-puppet.j2.yaml +++ b/overcloud-resource-registry-puppet.j2.yaml @@ -1,8 +1,8 @@ resource_registry: OS::TripleO::SoftwareDeployment: OS::Heat::StructuredDeployment - OS::TripleO::PostDeploySteps: puppet/post.yaml - OS::TripleO::PostUpgradeSteps: puppet/post-upgrade.yaml + OS::TripleO::PostDeploySteps: common/post.yaml + OS::TripleO::PostUpgradeSteps: common/post-upgrade.yaml OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml OS::TripleO::AllNodesDeployment: OS::Heat::StructuredDeployments OS::TripleO::Hosts::SoftwareConfig: hosts-config.yaml @@ -17,7 +17,7 @@ resource_registry: {% for role in roles %} OS::TripleO::{{role.name}}::PreNetworkConfig: OS::Heat::None - OS::TripleO::{{role.name}}PostDeploySteps: puppet/post.yaml + OS::TripleO::{{role.name}}PostDeploySteps: common/post.yaml OS::TripleO::{{role.name}}: puppet/{{role.name.lower()}}-role.yaml OS::TripleO::{{role.name}}Config: puppet/{{role.name.lower()}}-config.yaml OS::TripleO::Tasks::{{role.name}}PreConfig: OS::Heat::None |