diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-04-07 05:14:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-04-07 05:14:26 +0000 |
| commit | 40dbbd408ebd1582a3dd07efe7d0a953cab180a7 (patch) | |
| tree | 97bc2022de8f6317a78c42d5a3b2dbf075989a1a /puppet | |
| parent | f4c9d2abafcc0ce34f786b3c12884b648d90e6a8 (diff) | |
| parent | 77aa9a71020157f21b8898958a6d472b6297ac36 (diff) | |
Merge "Generate Pre/Post Puppet Tasks for all roles" into stable/ocata
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/puppet-steps.j2 | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/puppet/puppet-steps.j2 b/puppet/puppet-steps.j2 index cfa70f79..9d5623f0 100644 --- a/puppet/puppet-steps.j2 +++ b/puppet/puppet-steps.j2 @@ -23,14 +23,12 @@ properties: StepConfig: {get_param: [role_data, {{role.name}}, step_config]} - {% if role.name == 'Controller' %} - ControllerPrePuppet: - type: OS::TripleO::Tasks::ControllerPrePuppet + {{role.name}}PrePuppet: + type: OS::TripleO::Tasks::{{role.name}}PrePuppet properties: - servers: {get_param: [servers, Controller]} + servers: {get_param: [servers, {{role.name}}]} input_values: update_identifier: {get_param: DeployIdentifier} - {% endif %} {% if role.name in ['Controller', 'ObjectStorage'] %} {{role.name}}SwiftRingDeploy: @@ -84,16 +82,14 @@ properties: servers: {get_param: [servers, {{role.name}}]} - {% if role.name == 'Controller' %} - ControllerPostPuppet: + {{role.name}}PostPuppet: depends_on: - - ControllerExtraConfigPost - type: OS::TripleO::Tasks::ControllerPostPuppet + - {{role.name}}ExtraConfigPost + type: OS::TripleO::Tasks::{{role.name}}PostPuppet properties: - servers: {get_param: [servers, Controller]} + servers: {get_param: [servers, {{role.name}}]} input_values: update_identifier: {get_param: DeployIdentifier} - {% endif %} {% if role.name in ['Controller', 'ObjectStorage'] %} {{role.name}}SwiftRingUpdate: |