diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-04-19 15:12:34 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-04-19 15:12:34 +0000 |
commit | 8c86ce42ce26299c3af8f54df52f04c7d6a9e34f (patch) | |
tree | 8d4a41c7378d92f92756935fd15d68382ab31f6c /puppet/puppet-steps.j2 | |
parent | 1fa377d565e1649281f01883811cd7e899fce9d1 (diff) | |
parent | 96d3e644837565d3a8b4b728ace57156000f3134 (diff) |
Merge "Decouple Swift ringbuilding logic" into stable/ocata
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 9d5623f0..ed362e4e 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}}: @@ -90,15 +83,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 %} |