aboutsummaryrefslogtreecommitdiffstats
path: root/docker/docker-steps.j2
diff options
context:
space:
mode:
authorDan Prince <dprince@redhat.com>2017-04-11 13:51:26 -0400
committerDan Prince <dprince@redhat.com>2017-04-11 13:51:26 -0400
commit93e0e58bccae2f7cdd0a797447412287e717c619 (patch)
tree518bb2071974a5e29acfb24c03886f26f62a5fe7 /docker/docker-steps.j2
parent74684af1adb0326339abcf3825b001ecf11a1d2f (diff)
Use -net=host for docker-puppet.py config gen
We pass the short hostname to docker-puppet.py. In order to satisfy the factor FQDN check for the short hostname we need to run the container with --net=host in some cases. Change-Id: I2929f122f23ee33e8ea5d4c5006d2bbb8b928b67 Closes-bug: #1681903
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 301d838f..5ba8bf89 100644
--- a/docker/docker-steps.j2
+++ b/docker/docker-steps.j2
@@ -169,6 +169,8 @@ resources:
properties:
group: script
config: {get_file: docker-puppet.py}
+ inputs:
+ - name: NET_HOST
{{role.name}}GenerateConfigDeployment:
type: OS::Heat::SoftwareDeploymentGroup
@@ -177,6 +179,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