summaryrefslogtreecommitdiffstats
path: root/puppet/puppet-steps.j2
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-02-20 23:48:52 +0000
committerGerrit Code Review <review@openstack.org>2017-02-20 23:48:52 +0000
commitc94e09eeac08e537c1a68850ff77f37c1eb43bda (patch)
treebb4aef3882e48fa6563fd5c62940c7bd57c37eaa /puppet/puppet-steps.j2
parent435d2709860bf7044be860354d7d31cf6d43af6c (diff)
parent529768ae84f7713f2ae9447ff35ee2d63b4bdcd7 (diff)
Merge "Generate Pre/Post Puppet Tasks for all roles"
Diffstat (limited to 'puppet/puppet-steps.j2')
-rw-r--r--puppet/puppet-steps.j218
1 files changed, 7 insertions, 11 deletions
diff --git a/puppet/puppet-steps.j2 b/puppet/puppet-steps.j2
index b517db6e..581c4f0d 100644
--- a/puppet/puppet-steps.j2
+++ b/puppet/puppet-steps.j2
@@ -23,14 +23,12 @@
properties:
StepConfig: {list_join: ["\n", {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:
@@ -82,16 +80,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: