X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fironic-api.yaml;h=9583cd712f3436500deaf66dacb303dd6606777a;hb=ea4188cb4a3ce8d5febe9121374e15646b8c0cb4;hp=a32176af3be5217eef8d94312315f90b49de4875;hpb=6faea7a26b75b8e4db348be737c2bdaa3ec6b125;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml
index a32176af..9583cd71 100644
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@@ -13,7 +13,7 @@ parameters:
     default: 'centos-binary-ironic-api:latest'
     type: string
   DockerIronicConfigImage:
-    description: image
+    description: The container image to use for the ironic config_volume
     default: 'centos-binary-ironic-pxe:latest'
     type: string
   EndpointMap:
@@ -61,6 +61,7 @@ outputs:
       config_settings:
         map_merge:
           - get_attr: [IronicApiBase, role_data, config_settings]
+          - apache::default_vhost: false
       step_config: &step_config
         get_attr: [IronicApiBase, role_data, step_config]
       service_config_settings: {get_attr: [IronicApiBase, role_data, service_config_settings]}
@@ -75,7 +76,12 @@ outputs:
             - [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
       kolla_config:
         /var/lib/kolla/config_files/ironic_api.json:
-          command: /usr/bin/ironic-api
+          command: /usr/sbin/httpd -DFOREGROUND
+          config_files:
+            - source: "/var/lib/kolla/config_files/src/*"
+              dest: "/"
+              merge: true
+              preserve_properties: true
           permissions:
             - path: /var/log/ironic
               owner: ironic:ironic
@@ -84,7 +90,7 @@ outputs:
         # db sync runs before permissions set by kolla_config
         step_2:
           ironic_init_logs:
-            image: &ironic_image
+            image: &ironic_api_image
               list_join:
                 - '/'
                 - [ {get_param: DockerNamespace}, {get_param: DockerIronicApiImage} ]
@@ -96,7 +102,7 @@ outputs:
         step_3:
           ironic_db_sync:
             start_order: 1
-            image: *ironic_image
+            image: *ironic_api_image
             net: host
             privileged: false
             detach: false
@@ -111,16 +117,16 @@ outputs:
         step_4:
           ironic_api:
             start_order: 10
-            image: *ironic_image
+            image: *ironic_api_image
             net: host
-            privileged: false
+            user: root
             restart: always
             volumes:
               list_concat:
                 - {get_attr: [ContainersCommon, volumes]}
                 -
                   - /var/lib/kolla/config_files/ironic_api.json:/var/lib/kolla/config_files/config.json:ro
-                  - /var/lib/config-data/ironic/etc/ironic:/etc/ironic:ro
+                  - /var/lib/config-data/puppet-generated/ironic/:/var/lib/kolla/config_files/src:ro
                   - /var/log/containers/ironic:/var/log/ironic
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS