X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fironic-conductor.yaml;h=465aa8b177bff551a6fe6643b69dd25f73d3c195;hb=4290af63ca4d6d3d7080422979bcb5592b3160d2;hp=bf239b66843bc9134bbe32433c02d38fbc2d0f8a;hpb=b02aedb174bb8f5b10dc4d57d1ac36e7f1c24bb0;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/ironic-conductor.yaml b/docker/services/ironic-conductor.yaml
index bf239b66..465aa8b1 100644
--- a/docker/services/ironic-conductor.yaml
+++ b/docker/services/ironic-conductor.yaml
@@ -4,23 +4,21 @@ description: >
   OpenStack containerized Ironic Conductor service
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
   DockerIronicConductorImage:
     description: image
-    default: 'centos-binary-ironic-conductor: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
@@ -44,10 +42,14 @@ resources:
   ContainersCommon:
     type: ./containers-common.yaml
 
+  MySQLClient:
+    type: ../../puppet/services/database/mysql-client.yaml
+
   IronicConductorBase:
     type: ../../puppet/services/ironic-conductor.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       RoleName: {get_param: RoleName}
@@ -69,18 +71,20 @@ outputs:
           - ironic::pxe::tftp_root: /var/lib/ironic/tftpboot
           - ironic::pxe::http_root: /var/lib/ironic/httpboot
           - ironic::conductor::http_root: /var/lib/ironic/httpboot
+      logging_source: {get_attr: [IronicConductorBase, role_data, logging_source]}
+      logging_groups: {get_attr: [IronicConductorBase, role_data, logging_groups]}
       step_config: &step_config
-        get_attr: [IronicConductorBase, role_data, step_config]
+        list_join:
+          - "\n"
+          - - {get_attr: [IronicConductorBase, role_data, step_config]}
+            - {get_attr: [MySQLClient, role_data, step_config]}
       service_config_settings: {get_attr: [IronicConductorBase, role_data, service_config_settings]}
       # BEGIN DOCKER SETTINGS
       puppet_config:
         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_conductor.json:
           command: /usr/bin/ironic-conductor
@@ -100,10 +104,7 @@ outputs:
         step_4:
           ironic_conductor:
             start_order: 80
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerIronicConductorImage} ]
+            image: {get_param: DockerIronicConductorImage}
             net: host
             privileged: true
             restart: always