summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-06-27 10:04:14 +0000
committerGerrit Code Review <review@openstack.org>2017-06-27 10:04:14 +0000
commitf7062d83d794aacc74614c165a968884285da957 (patch)
treeb172dfcaa6ea4519e84c5f29c3b5a0212b86a2f2 /puppet
parent86c2e0c0c8b94f252cc210b374b3571456b680f3 (diff)
parent9c1940e461867f2ce986a81fa313d7995592f0c5 (diff)
Merge "Provides a list of per-service ctlplane IPs to the workflows env"
Diffstat (limited to 'puppet')
-rw-r--r--puppet/post.j2.yaml2
-rw-r--r--puppet/puppet-steps.j26
2 files changed, 8 insertions, 0 deletions
diff --git a/puppet/post.j2.yaml b/puppet/post.j2.yaml
index 370ffa8a..67e1ecfd 100644
--- a/puppet/post.j2.yaml
+++ b/puppet/post.j2.yaml
@@ -25,5 +25,7 @@ parameters:
description: >
Setting this to a unique value will re-run any deployment tasks which
perform configuration on a Heat stack-update.
+ ctlplane_service_ips:
+ type: json
{% include 'puppet-steps.j2' %}
diff --git a/puppet/puppet-steps.j2 b/puppet/puppet-steps.j2
index cc681fd3..82c6171e 100644
--- a/puppet/puppet-steps.j2
+++ b/puppet/puppet-steps.j2
@@ -133,8 +133,14 @@ resources:
actions:
CREATE:
workflow: { get_resource: WorkflowTasks_Step{{step}} }
+ params:
+ env:
+ service_ips: { get_param: ctlplane_service_ips }
UPDATE:
workflow: { get_resource: WorkflowTasks_Step{{step}} }
+ params:
+ env:
+ service_ips: { get_param: ctlplane_service_ips }
always_update: true
{% endfor %}
# END service_workflow_tasks handling