From: Dan Prince <dprince@redhat.com>
Date: Fri, 7 Jul 2017 01:03:30 +0000 (-0400)
Subject: Fix ironic-pxe startup issues
X-Git-Tag: opnfv-6.0.0~411^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4e32440146116875c9308700fe194a1c96d98022;p=apex-tripleo-heat-templates.git

Fix ironic-pxe startup issues

This patch updates the ironic-api docker service so that it
generates its config files in a unique config root. This
ensures that it doesn't have config files in the httpd
conf.d directory for both the API and PXE services thus
causing the API container to attempt to launch both of them.

This functionally fixes the Ironic API and PXE services with
docker so they once again can bring up an overcloud.

Change-Id: I537cd6a3337bf776ca38a279b7c130b6429eea04
Closes-bug: #1702799
---

diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml
index 9583cd71..d18221db 100644
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@@ -12,9 +12,9 @@ parameters:
     description: image
     default: 'centos-binary-ironic-api:latest'
     type: string
-  DockerIronicConfigImage:
-    description: The container image to use for the ironic config_volume
-    default: 'centos-binary-ironic-pxe:latest'
+  DockerIronicApiConfigImage:
+    description: The container image to use for the ironic_api config_volume
+    default: 'centos-binary-ironic-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -67,13 +67,13 @@ outputs:
       service_config_settings: {get_attr: [IronicApiBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
-        config_volume: ironic
+        config_volume: ironic_api
         puppet_tags: ironic_config
         step_config: *step_config
         config_image:
           list_join:
             - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
+            - [ {get_param: DockerNamespace}, {get_param: DockerIronicApiConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/ironic_api.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -111,7 +111,7 @@ outputs:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
-                  - /var/lib/config-data/ironic/etc/ironic:/etc/ironic:ro
+                  - /var/lib/config-data/ironic_api/etc/ironic:/etc/ironic:ro
                   - /var/log/containers/ironic:/var/log/ironic
             command: "/usr/bin/bootstrap_host_exec ironic_api su ironic -s /bin/bash -c 'ironic-dbsync --config-file /etc/ironic/ironic.conf'"
         step_4:
@@ -126,7 +126,7 @@ outputs:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/ironic_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/puppet-generated/ironic/:/var/lib/kolla/config_files/src:ro
+                  - /var/lib/config-data/puppet-generated/ironic_api/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/ironic:/var/log/ironic
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS