X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fneutron-api.yaml;h=00b1f85766227f1849fa617c6121ca2df1879b8d;hb=68402dc7f538418b1e0eb23bb782daf7e3bcadd4;hp=c5001a304d3d32a516a95e04273a5489bedc4b17;hpb=0846b3d76e9ad8df1cba3bfe64afb419b47e76f0;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/neutron-api.yaml b/docker/services/neutron-api.yaml
index c5001a30..00b1f857 100644
--- a/docker/services/neutron-api.yaml
+++ b/docker/services/neutron-api.yaml
@@ -34,6 +34,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   NeutronBase:
     type: ../../puppet/services/neutron-api.yaml
     properties:
@@ -78,10 +81,13 @@ outputs:
             # and run as neutron user
             user: root
             volumes:
-              - /var/lib/config-data/neutron/etc/neutron:/etc/neutron:ro
-              - /var/lib/config-data/neutron/usr/share/neutron:/usr/share/neutron: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/config-data/neutron/etc/neutron:/etc/neutron:ro
+                    - /var/lib/config-data/neutron/usr/share/neutron:/usr/share/neutron:ro
             command: ['neutron-db-manage', 'upgrade', 'heads']
         step_4:
           neutron_api:
@@ -90,10 +96,13 @@ outputs:
             privileged: false
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/neutron_api.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/: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/neutron_api.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/neutron/etc/neutron/:/etc/neutron/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks: