diff options
author | 2017-04-24 18:42:00 +0000 | |
---|---|---|
committer | 2017-04-24 18:42:00 +0000 | |
commit | b364c5eb9dab93e3fb5f3bb329ee27bca32e985c (patch) | |
tree | d2bdc7701bfa0b97496f35f290dbdc476d48fe4e /puppet | |
parent | 3042ee8b30132c76a81c41c273c8e0c9653b6662 (diff) | |
parent | 258c6ce52d0c8467f34693722a883d96345802b2 (diff) |
Merge "Merge pre|post puppet resources into pre|post config."
Diffstat (limited to 'puppet')
-rw-r--r-- | puppet/puppet-steps.j2 | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/puppet/puppet-steps.j2 b/puppet/puppet-steps.j2 index 782a32c9..45b3ea30 100644 --- a/puppet/puppet-steps.j2 +++ b/puppet/puppet-steps.j2 @@ -23,19 +23,12 @@ properties: StepConfig: {list_join: ["\n", {get_param: [role_data, {{role.name}}, step_config]}]} - {{role.name}}PrePuppet: - type: OS::TripleO::Tasks::{{role.name}}PrePuppet - properties: - servers: {get_param: [servers, {{role.name}}]} - input_values: - update_identifier: {get_param: DeployIdentifier} - # Step through a series of configuration steps {% for step in range(1, 6) %} {{role.name}}Deployment_Step{{step}}: type: OS::Heat::StructuredDeploymentGroup {% if step == 1 %} - depends_on: [{{role.name}}PrePuppet, {{role.name}}PreConfig, {{role.name}}ArtifactsDeploy] + depends_on: [{{role.name}}PreConfig, {{role.name}}ArtifactsDeploy] {% else %} depends_on: {% for dep in roles %} @@ -58,7 +51,7 @@ - {{dep.name}}Deployment_Step5 {% endfor %} properties: - servers: {get_param: servers} + servers: {get_param: [servers, {{role.name}}]} input_values: update_identifier: {get_param: DeployIdentifier} @@ -73,12 +66,4 @@ properties: servers: {get_param: [servers, {{role.name}}]} - {{role.name}}PostPuppet: - depends_on: - - {{role.name}}ExtraConfigPost - type: OS::TripleO::Tasks::{{role.name}}PostPuppet - properties: - servers: {get_param: [servers, {{role.name}}]} - input_values: - update_identifier: {get_param: DeployIdentifier} {% endfor %} |