diff options
author | Christian Schwede <cschwede@redhat.com> | 2017-02-20 21:22:25 +0000 |
---|---|---|
committer | Christian Schwede <cschwede@redhat.com> | 2017-04-11 11:42:31 +0000 |
commit | 96d3e644837565d3a8b4b728ace57156000f3134 (patch) | |
tree | 55af5072dd9df9be4c24d95ad04856fa3e2e7e32 /overcloud-resource-registry-puppet.j2.yaml | |
parent | be70e18a27beaa14009ae48bd5474daff82ab077 (diff) |
Decouple Swift ringbuilding logic
This reverts commit b323f8a16035549d84cdec4718380bde3d23d6c3 and uses
the new logic in puppet-tripleo, basically doing the same.
Closes-Bug: 1665641
Depends-On: Ifd6fa5b398d98e8998630ea0c9a2ce9867ceba2b
Change-Id: Ib5cb0578be2993af0a0b8675005d838640bdb139
(cherry picked from commit 76c1c0cbba38b2f25290f5ad80e38ddd97ae834b)
Diffstat (limited to 'overcloud-resource-registry-puppet.j2.yaml')
-rw-r--r-- | overcloud-resource-registry-puppet.j2.yaml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/overcloud-resource-registry-puppet.j2.yaml b/overcloud-resource-registry-puppet.j2.yaml index 1360d0be..5c277491 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 |