X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fswift-proxy.yaml;h=6e8d6eb96521c7d6863c202fc26409aff1ebb8ac;hb=386ac7791b1ed53445c059ec2b7b9f1a00222a37;hp=e60aca12846b0d567471bb4dd91ff21ec328d5dd;hpb=36ee7bbe1b7bea0ec54dcefe8e4d7dd0fcbe482e;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml
index e60aca12..6e8d6eb9 100644
--- a/docker/services/swift-proxy.yaml
+++ b/docker/services/swift-proxy.yaml
@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   SwiftProxyBase:
     type: ../../puppet/services/swift-proxy.yaml
     properties:
@@ -65,15 +68,18 @@ outputs:
             user: swift
             restart: always
             volumes:
-              - /var/lib/kolla/config_files/swift_proxy.json:/var/lib/kolla/config_files/config.json:ro
-              # FIXME I'm mounting /etc/swift as rw.  Are the rings written to
-              # at all during runtime?
-              - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
-              - /etc/hosts:/etc/hosts:ro
-              - /etc/localtime:/etc/localtime:ro
-              - /run:/run
-              - /srv/node:/srv/node
-              - /dev:/dev
+              yaql:
+                expression: $.data.common.concat($.data.service)
+                data:
+                  common: {get_attr: [ContainersCommon, volumes]}
+                  service:
+                    - /var/lib/kolla/config_files/swift_proxy.json:/var/lib/kolla/config_files/config.json:ro
+                    # FIXME I'm mounting /etc/swift as rw.  Are the rings written to
+                    # at all during runtime?
+                    - /var/lib/config-data/swift/etc/swift:/etc/swift:rw
+                    - /run:/run
+                    - /srv/node:/srv/node
+                    - /dev:/dev
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks: