Merge "Fix dependencies for PreConfig/PostConfig resources"
This commit is contained in:
commit
2399cb8514
@ -256,14 +256,12 @@ resources:
|
||||
|
||||
# BEGIN BAREMETAL CONFIG STEPS
|
||||
|
||||
{% if role.name == 'Controller' %}
|
||||
ControllerPreConfig:
|
||||
type: OS::TripleO::Tasks::ControllerPreConfig
|
||||
{{role.name}}PreConfig:
|
||||
type: OS::TripleO::Tasks::{{role.name}}PreConfig
|
||||
properties:
|
||||
servers: {get_param: [servers, Controller]}
|
||||
servers: {get_param: [servers, {{role.name}}]}
|
||||
input_values:
|
||||
update_identifier: {get_param: DeployIdentifier}
|
||||
{% endif %}
|
||||
|
||||
{{role.name}}Config:
|
||||
type: OS::TripleO::{{role.name}}Config
|
||||
@ -309,10 +307,12 @@ resources:
|
||||
type: OS::Heat::StructuredDeploymentGroup
|
||||
{% if step == 1 %}
|
||||
depends_on:
|
||||
- {{role.name}}PreConfig
|
||||
- {{role.name}}KollaJsonDeployment
|
||||
- {{role.name}}GenPuppetDeployment
|
||||
- {{role.name}}GenerateConfigDeployment
|
||||
{%- for dep in roles %}
|
||||
- {{dep.name}}Deployment_Step{{step}} # baremetal steps of the same level run first
|
||||
{%- endfor %}
|
||||
{% else %}
|
||||
depends_on:
|
||||
{% for dep in roles %}
|
||||
@ -353,15 +353,4 @@ resources:
|
||||
properties:
|
||||
servers: {get_param: [servers, {{role.name}}]}
|
||||
|
||||
{% if role.name == 'Controller' %}
|
||||
ControllerPostConfig:
|
||||
depends_on:
|
||||
- ControllerExtraConfigPost
|
||||
type: OS::TripleO::Tasks::ControllerPostConfig
|
||||
properties:
|
||||
servers: {get_param: [servers, Controller]}
|
||||
input_values:
|
||||
update_identifier: {get_param: DeployIdentifier}
|
||||
{% endif %}
|
||||
|
||||
{% endfor %}
|
||||
|
Loading…
Reference in New Issue
Block a user