Code Review
/
apex-tripleo-heat-templates.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Sort ResourceGroup resource list"
[apex-tripleo-heat-templates.git]
/
puppet
/
puppet-steps.j2
diff --git
a/puppet/puppet-steps.j2
b/puppet/puppet-steps.j2
index
4eca233
..
86af611
100644
(file)
--- a/
puppet/puppet-steps.j2
+++ b/
puppet/puppet-steps.j2
@@
-21,16
+21,14
@@
{{role.name}}Config:
type: OS::TripleO::{{role.name}}Config
properties:
{{role.name}}Config:
type: OS::TripleO::{{role.name}}Config
properties:
- StepConfig: {
get_param: [role_data, {{role.name}}, step_config
]}
+ 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:
properties:
- servers: {get_param: [servers,
Controller
]}
+ servers: {get_param: [servers,
{{role.name}}
]}
input_values:
update_identifier: {get_param: DeployIdentifier}
input_values:
update_identifier: {get_param: DeployIdentifier}
- {% endif %}
{% if role.name in ['Controller', 'ObjectStorage'] %}
{{role.name}}SwiftRingDeploy:
{% if role.name in ['Controller', 'ObjectStorage'] %}
{{role.name}}SwiftRingDeploy:
@@
-44,7
+42,7
@@
{{role.name}}Deployment_Step{{step}}:
type: OS::Heat::StructuredDeploymentGroup
{% if step == 1 %}
{{role.name}}Deployment_Step{{step}}:
type: OS::Heat::StructuredDeploymentGroup
{% if step == 1 %}
- depends_on: [{{role.name}}PreConfig, {{role.name}}ArtifactsDeploy]
+ depends_on: [{{role.name}}Pre
Puppet, {{role.name}}Pre
Config, {{role.name}}ArtifactsDeploy]
{% else %}
depends_on:
{% for dep in roles %}
{% else %}
depends_on:
{% for dep in roles %}
@@
-82,16
+80,14
@@
properties:
servers: {get_param: [servers, {{role.name}}]}
properties:
servers: {get_param: [servers, {{role.name}}]}
- {% if role.name == 'Controller' %}
- ControllerPostPuppet:
+ {{role.name}}PostPuppet:
depends_on:
depends_on:
- -
Controller
ExtraConfigPost
- type: OS::TripleO::Tasks::
Controller
PostPuppet
+ -
{{role.name}}
ExtraConfigPost
+ type: OS::TripleO::Tasks::
{{role.name}}
PostPuppet
properties:
properties:
- servers: {get_param: [servers,
Controller
]}
+ servers: {get_param: [servers,
{{role.name}}
]}
input_values:
update_identifier: {get_param: DeployIdentifier}
input_values:
update_identifier: {get_param: DeployIdentifier}
- {% endif %}
{% if role.name in ['Controller', 'ObjectStorage'] %}
{{role.name}}SwiftRingUpdate:
{% if role.name in ['Controller', 'ObjectStorage'] %}
{{role.name}}SwiftRingUpdate: