X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=docker%2Fservices%2Fnova-placement.yaml;h=e579e158e61232ee26d6ba47b6d2178f2c6d0779;hb=68402dc7f538418b1e0eb23bb782daf7e3bcadd4;hp=0c595dc26bba84656fb30cb84e07ab6cc1df52ee;hpb=ac03bcfffef5a83df4a458cbc92117ada6cf7301;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/nova-placement.yaml b/docker/services/nova-placement.yaml
index 0c595dc2..e579e158 100644
--- a/docker/services/nova-placement.yaml
+++ b/docker/services/nova-placement.yaml
@@ -10,7 +10,7 @@ parameters:
     type: string
   DockerNovaPlacementImage:
     description: image
-    default: 'centos-binary-nova-placement-api'
+    default: 'centos-binary-nova-placement-api:latest'
     type: string
   EndpointMap:
     default: {}
@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   NovaPlacementBase:
     type: ../../puppet/services/nova-placement.yaml
     properties:
@@ -70,12 +73,15 @@ outputs:
             user: root
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/nova_placement.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/nova_placement/etc/nova/:/etc/nova/:ro
-              - /var/lib/config-data/nova_placement/etc/httpd/:/etc/httpd/:ro
-              - /var/lib/config-data/nova_placement/var/www/:/var/www/: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/nova_placement.json:/var/lib/kolla/config_files/config.json:ro
+                    - /var/lib/config-data/nova_placement/etc/nova/:/etc/nova/:ro
+                    - /var/lib/config-data/nova_placement/etc/httpd/:/etc/httpd/:ro
+                    - /var/lib/config-data/nova_placement/var/www/:/var/www/:ro
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       upgrade_tasks: