From 93e0e58bccae2f7cdd0a797447412287e717c619 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Tue, 11 Apr 2017 13:51:26 -0400
Subject: 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
---
 docker/docker-steps.j2 | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'docker/docker-steps.j2')

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
-- 
cgit 1.2.3-korg