Merge "Use hostNetwork for ephemeral heat pod"

templates/ephemeral-heat/heat-pod.yaml.j2

@@ -5,6 +5,7 @@ metadata:
     app: {{ heat_pod_name }}
   name: {{ heat_pod_name }}
 spec:
+  hostNetwork: true
   containers:
   - command:
     - heat-engine
@@ -41,10 +42,6 @@ spec:
     - heat-api
     - --config-file
     - /etc/heat/heat.conf
-    ports:
-    - containerPort: {{ api_port }}
-      hostPort: {{ api_port }}
-      hostIP: {{ ctlplane_ip }}
     env:
     - name: PATH
       value: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin

tripleoclient/heat_launcher.py

@@ -782,8 +782,6 @@ class HeatPodLauncher(HeatContainerLauncher):
         pod_vars = {
             "install_dir": self.install_dir,
             "heat_dir": self.heat_dir,
-            "ctlplane_ip": self.host,
-            "api_port": self.api_port,
             "api_image": self.api_container_image,
             "engine_image": self.engine_container_image,
             "heat_pod_name": EPHEMERAL_HEAT_POD_NAME

tripleoclient/tests/test_heat_launcher.py

@@ -550,15 +550,11 @@ class TestHeatPodLauncher(base.TestCase):
     def test_write_heat_pod(self):
         launcher = self.get_launcher()
         launcher.install_dir = 'install-dir'
-        launcher.host = '1.1.1.1'
-        launcher.api_port = '1234'
         launcher.api_container_image = 'api-image'
         launcher.engine_container_image = 'engine-image'
         launcher._write_heat_pod()
         with open(os.path.join(launcher.heat_dir, 'heat-pod.yaml')) as f:
             pod = f.read()
-            self.assertIn('hostPort: 1234', pod)
-            self.assertIn('hostIP: 1.1.1.1', pod)
             self.assertIn('image: api-image', pod)
             self.assertIn('image: engine-image', pod)