Merge "Add network_data.yaml to encapsulate list of networks for j2"

[apex-tripleo-heat-templates.git] / docker / services / ironic-api.yaml

diff --git a/docker/services/ironic-api.yaml b/docker/services/ironic-api.yaml
index 5ae82d4..a019a61 100644 (file)
--- a/docker/services/ironic-api.yaml
+++ b/docker/services/ironic-api.yaml
@@ -33,6 +33,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   IronicApiBase:
     type: ../../puppet/services/ironic-api.yaml
     properties:
@@ -61,13 +64,8 @@ outputs:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerIronicConfigImage} ]
       kolla_config:
-         /var/lib/kolla/config_files/ironic_api.json:
-           command: /usr/bin/ironic-api
-           config_files:
-           - dest: /etc/ironic/ironic.conf
-             owner: ironic
-             perm: '0640'
-             source: /var/lib/kolla/config_files/src/etc/ironic/ironic.conf
+        /var/lib/kolla/config_files/ironic_api.json:
+          command: /usr/bin/ironic-api
       docker_config:
         step_3:
           ironic_db_sync:
@@ -79,11 +77,12 @@ outputs:
             privileged: false
             detach: false
             volumes:
-              - /var/lib/config-data/ironic/etc/:/etc/:ro
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-            environment:
-              - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/config-data/ironic/etc/:/etc/:ro
             command: ['ironic-dbsync', '--config-file', '/etc/ironic/ironic.conf']
         step_4:
           ironic_api:
@@ -93,10 +92,13 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/ironic_api.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/ironic/:/var/lib/kolla/config_files/src:ro
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/ironic_api.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/ironic/etc/:/etc/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks: