aboutsummaryrefslogtreecommitdiffstats
path: root/docker/post.j2.yaml
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2017-02-23 14:42:19 -0500
committerDan Prince <dprince@redhat.com>2017-02-23 14:45:47 -0500
commitf09f50f96ae5978e71c6bc42bb6a6a9652649851 (patch)
treeb175ef45b16334f9183b954a29feb32eac1c0924 /docker/post.j2.yaml
parent571e67c1361bbeff7b79bdc3ba75b4c8b0c508af (diff)
Add step to docker_puppet_tasks
This patch sets the step correctly for docker_puppet_tasks. This is now required in order to match the 'step' in some puppet manifests explicitly so that things like keystone initialization run correctly. Closes-bug: #1667454 Change-Id: If2bdd0b1051125674f116f895832b48723d82b3a
Diffstat (limited to 'docker/post.j2.yaml')
-rw-r--r--docker/post.j2.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/docker/post.j2.yaml b/docker/post.j2.yaml
index 3473f4ca..e1154a62 100644
--- a/docker/post.j2.yaml
+++ b/docker/post.j2.yaml
@@ -68,6 +68,7 @@ resources:
- name: CONFIG
- name: NET_HOST
- name: NO_ARCHIVE
+ - name: STEP
{{primary_role_name}}DockerPuppetTasksDeployment{{step}}:
type: OS::Heat::SoftwareDeployment
@@ -85,6 +86,7 @@ resources:
CONFIG: /var/lib/docker-puppet/docker-puppet-tasks{{step}}.json
NET_HOST: 'true'
NO_ARCHIVE: 'true'
+ STEP: {{step}}
{% endfor %}
# END primary_role_name docker-puppet-tasks