summaryrefslogtreecommitdiffstats
path: root/overcloud-resource-registry-puppet.j2.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-11 11:03:13 +0000
committerGerrit Code Review <review@openstack.org>2017-04-11 11:03:13 +0000
commit74684af1adb0326339abcf3825b001ecf11a1d2f (patch)
tree0cc1154f16b7d34a20dd7202f254047292f723e2 /overcloud-resource-registry-puppet.j2.yaml
parentccb0655db4cb0df125a52262e67b39609f78703b (diff)
parent76c1c0cbba38b2f25290f5ad80e38ddd97ae834b (diff)
Merge "Decouple Swift ringbuilding logic"
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
-rw-r--r--overcloud-resource-registry-puppet.j2.yaml3
1 files changed, 0 insertions, 3 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml
index 689d6396..c0f5f7e5 100644
--- a/overcloud-resource-registry-puppet.j2.yaml
+++ b/overcloud-resource-registry-puppet.j2.yaml
@@ -11,9 +11,6 @@ resource_registry:
OS::TripleO::Tasks::UpdateWorkflow: OS::Heat::None
OS::TripleO::Tasks::PackageUpdate: extraconfig/tasks/yum_update.yaml
- OS::TripleO::Tasks::SwiftRingDeploy: extraconfig/tasks/swift-ring-deploy.yaml
- OS::TripleO::Tasks::SwiftRingUpdate: extraconfig/tasks/swift-ring-update.yaml
-
{% for role in roles %}
OS::TripleO::{{role.name}}::PreNetworkConfig: OS::Heat::None
OS::TripleO::{{role.name}}PostDeploySteps: puppet/post.yaml