aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-21 12:20:33 +0000
committerGerrit Code Review <review@openstack.org>2017-04-21 12:20:34 +0000
commit2e15949d3160cb6e74f9c23985a28ad20145cc33 (patch)
treebd41b8e227efb970f04160e4c00f05a11a3d73f7
parent63bd7483196808d028b2e35d9cc4e4e1609969da (diff)
parent0a5d85ea32cdc87c24099d41443bffc06718960b (diff)
Merge "Add defaults for docker puppet tasks"
-rw-r--r--docker/docker-steps.j214
1 files changed, 10 insertions, 4 deletions
diff --git a/docker/docker-steps.j2 b/docker/docker-steps.j2
index f0af8e25..1cac152f 100644
--- a/docker/docker-steps.j2
+++ b/docker/docker-steps.j2
@@ -9,6 +9,8 @@
{%- endfor -%}
{%- set primary_role_name = primary_role[0].name -%}
# primary role is: {{primary_role_name}}
+{% set deploy_steps_max = 6 -%}
+
heat_template_version: ocata
description: >
@@ -45,12 +47,16 @@ resources:
value:
yaql:
expression:
- dict($.data.docker_puppet_tasks.where($1 != null).selectMany($.items()).groupBy($[0], $[1]))
+ $.data.default_tasks + dict($.data.docker_puppet_tasks.where($1 != null).selectMany($.items()).groupBy($[0], $[1]))
data:
docker_puppet_tasks: {get_param: [role_data, {{primary_role_name}}, docker_puppet_tasks]}
+ default_tasks:
+{%- for step in range(1, deploy_steps_max) %}
+ step_{{step}}: {}
+{%- endfor %}
# BEGIN primary_role_name docker-puppet-tasks (run only on a single node)
-{% for step in range(1, 6) %}
+{% for step in range(1, deploy_steps_max) %}
{{primary_role_name}}DockerPuppetJsonConfig{{step}}:
type: OS::Heat::StructuredConfig
@@ -260,7 +266,7 @@ resources:
properties:
StepConfig: {get_attr: [{{role.name}}PuppetStepConfig, value]}
- {% for step in range(1, 6) %}
+ {% for step in range(1, deploy_steps_max) %}
{{role.name}}Deployment_Step{{step}}:
type: OS::Heat::StructuredDeploymentGroup
@@ -286,7 +292,7 @@ resources:
# END BAREMETAL CONFIG STEPS
# BEGIN CONTAINER CONFIG STEPS
- {% for step in range(1, 6) %}
+ {% for step in range(1, deploy_steps_max) %}
{{role.name}}ContainersConfig_Step{{step}}:
type: OS::Heat::StructuredConfig