aboutsummaryrefslogtreecommitdiffstats
path: root/docker/docker-steps.j2
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-04-21 12:56:11 +0000
committerGerrit Code Review <review@openstack.org>2017-04-21 12:56:11 +0000
commit85b2282336171139998a55979a1506f29cc08dbe (patch)
tree3bf368214259161ddf7edfe96ba6703b42581549 /docker/docker-steps.j2
parent2e15949d3160cb6e74f9c23985a28ad20145cc33 (diff)
parent93e0e58bccae2f7cdd0a797447412287e717c619 (diff)
Merge "Use -net=host for docker-puppet.py config gen"
Diffstat (limited to 'docker/docker-steps.j2')
-rw-r--r--docker/docker-steps.j24
1 files changed, 4 insertions, 0 deletions
diff --git a/docker/docker-steps.j2 b/docker/docker-steps.j2
index 1cac152f..643727db 100644
--- a/docker/docker-steps.j2
+++ b/docker/docker-steps.j2
@@ -182,6 +182,8 @@ resources:
properties:
group: script
config: {get_file: docker-puppet.py}
+ inputs:
+ - name: NET_HOST
{{role.name}}GenerateConfigDeployment:
type: OS::Heat::SoftwareDeploymentGroup
@@ -190,6 +192,8 @@ resources:
name: {{role.name}}GenerateConfigDeployment
servers: {get_param: [servers, {{role.name}}]}
config: {get_resource: {{role.name}}GenerateConfig}
+ input_values:
+ NET_HOST: 'true'
{{role.name}}PuppetStepConfig:
type: OS::Heat::Value