diff options
| author |   Christian Schwede <cschwede@redhat.com> | 2017-02-20 21:22:25 +0000 |
|---|---|---|
| committer | Christian Schwede <cschwede@redhat.com> | 2017-04-10 07:23:27 +0000 |
| commit | 76c1c0cbba38b2f25290f5ad80e38ddd97ae834b (patch) | |
| tree | 9375a3c0c845232274c7f5e87c1851f5ca4b31ca /puppet/puppet-steps.j2 | |
| parent | 2bc62ed305f73ca06e37559819edc6498446a1a0 (diff) | |
Decouple Swift ringbuilding logic
This reverts commit b323f8a16035549d84cdec4718380bde3d23d6c3 and uses
the new logic in puppet-tripleo (see Ifd6fa5b398d98e8998630ea0c9a2ce9867ceba2b
), basically doing the same.
Closes-Bug: 1665641
Change-Id: Ib5cb0578be2993af0a0b8675005d838640bdb139
Diffstat (limited to 'puppet/puppet-steps.j2')
| -rw-r--r-- | puppet/puppet-steps.j2 | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/puppet/puppet-steps.j2 b/puppet/puppet-steps.j2 index 86af6114..782a32c9 100644 --- a/puppet/puppet-steps.j2 +++ b/puppet/puppet-steps.j2 @@ -30,13 +30,6 @@ input_values: update_identifier: {get_param: DeployIdentifier} - {% if role.name in ['Controller', 'ObjectStorage'] %} - {{role.name}}SwiftRingDeploy: - type: OS::TripleO::Tasks::SwiftRingDeploy - properties: - servers: {get_param: [servers, {{role.name}}]} - {% endif %} - # Step through a series of configuration steps {% for step in range(1, 6) %} {{role.name}}Deployment_Step{{step}}: @@ -88,15 +81,4 @@ servers: {get_param: [servers, {{role.name}}]} input_values: update_identifier: {get_param: DeployIdentifier} - - {% if role.name in ['Controller', 'ObjectStorage'] %} - {{role.name}}SwiftRingUpdate: - type: OS::TripleO::Tasks::SwiftRingUpdate - depends_on: - {% for dep in roles %} - - {{dep.name}}Deployment_Step5 - {% endfor %} - properties: - servers: {get_param: [servers, {{role.name}}]} - {% endif %} {% endfor %} |