X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fswift-proxy.yaml;h=8ea42222b50c2152ccc2cf9b4845e2e9ed918354;hb=c7471e7503a61ed6895ac6ce92ca48afd225343b;hp=0d7cd7b93b160622eef026ca3fe6c83298a5f7ef;hpb=8022b520d365055b9ad9be1f57b52fed556e1d45;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml
index 0d7cd7b9..8ea42222 100644
--- a/docker/services/swift-proxy.yaml
+++ b/docker/services/swift-proxy.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   OpenStack containerized swift proxy service
@@ -29,6 +29,9 @@ parameters:
 
 resources:
 
+  ContainersCommon:
+    type: ./containers-common.yaml
+
   SwiftProxyBase:
     type: ../../puppet/services/swift-proxy.yaml
     properties:
@@ -64,16 +67,17 @@ outputs:
             net: host
             user: swift
             restart: always
-            # I'm mounting /etc/swift as rw.  Are the rings written to at all during runtime?
             volumes:
-              - /var/lib/kolla/config_files/swift_proxy.json:/var/lib/kolla/config_files/config.json:ro
-              - /var/lib/config-data/swift:/var/lib/kolla/config_files/src:ro
-              - /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
+              list_concat:
+                - {get_attr: [ContainersCommon, 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
+                  - /run:/run
+                  - /srv/node:/srv/node
+                  - /dev:/dev
             environment:
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
       host_prep_tasks: