X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fironic-pxe.yaml;h=878eef6376f45f27c375fff5e791c8ca36417848;hb=684bb3689501376f44be677adde4f00ce7185928;hp=a82a3af9d0357dfed3a6850144d3060fb5be05ed;hpb=cdd6d4872e9fdad9d9390d062ec730854c8643a5;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/ironic-pxe.yaml b/docker/services/ironic-pxe.yaml
index a82a3af9..878eef63 100644
--- a/docker/services/ironic-pxe.yaml
+++ b/docker/services/ironic-pxe.yaml
@@ -4,23 +4,21 @@ description: >
   OpenStack containerized Ironic PXE service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerIronicPxeImage:
     description: image
-    default: 'centos-binary-ironic-pxe:latest'
     type: string
   DockerIronicConfigImage:
     description: The container image to use for the ironic config_volume
-    default: 'centos-binary-ironic-pxe:latest'
     type: string
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -57,10 +55,7 @@ outputs:
         config_volume: ironic
         puppet_tags: ironic_config
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
+        config_image: {get_param: DockerIronicConfigImage}
       kolla_config:
         /var/lib/kolla/config_files/ironic_pxe_http.json:
           command: /usr/sbin/httpd -DFOREGROUND
@@ -84,10 +79,7 @@ outputs:
         step_4:
           ironic_pxe_tftp:
             start_order: 90
-            image: &ironic_pxe_image
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerIronicPxeImage} ]
+            image: &ironic_pxe_image {get_param: DockerIronicPxeImage}
             net: host
             privileged: false
             restart: always
@@ -100,6 +92,7 @@ outputs:
                   - /var/lib/ironic:/var/lib/ironic/
                   - /dev/log:/dev/log
                   - /var/log/containers/ironic:/var/log/ironic
+                  - /var/log/containers/httpd/ironic-pxe:/var/log/httpd
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           ironic_pxe_http:
@@ -116,6 +109,7 @@ outputs:
                   - /var/lib/config-data/puppet-generated/ironic/:/var/lib/kolla/config_files/src:ro
                   - /var/lib/ironic:/var/lib/ironic/
                   - /var/log/containers/ironic:/var/log/ironic
+                  - /var/log/containers/httpd/ironic-pxe:/var/log/httpd
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks:
@@ -126,3 +120,4 @@ outputs:
           with_items:
             - /var/lib/ironic
             - /var/log/containers/ironic
+            - /var/log/containers/httpd/ironic-pxe