summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-25 22:05:11 +0000
committerGerrit Code Review <review@openstack.org>2017-04-25 22:05:11 +0000
commit2399cb85144008bd1a2705809ccef2109a453905 (patch)
treed1c53d040a9ccff4d92aa5cc3478db73b4f5796a
parentb32a9b8b1828b5a1ea359ecfd4cc94cc1f01e0e9 (diff)
parentba44524d4603b9f53a06e44af80b46a24661bdb1 (diff)
Merge "Fix dependencies for PreConfig/PostConfig resources"
-rw-r--r--docker/docker-steps.j223
1 files changed, 6 insertions, 17 deletions
diff --git a/docker/docker-steps.j2 b/docker/docker-steps.j2
index d41b1056..1d5605b2 100644
--- a/docker/docker-steps.j2
+++ b/docker/docker-steps.j2
@@ -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 %}