X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fswift-storage.yaml;h=301ef69b7afed1d8783d636c1ef2a8d9d6069883;hb=f1c452fcf672b2543a06576cf55c8eb9e8f2061f;hp=9c8d84e293150ab2f0c8751e3d2d3518d5d668a6;hpb=430556b373b8611dad415528721e59f18b6f6f12;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml
index 9c8d84e2..301ef69b 100644
--- a/docker/services/swift-storage.yaml
+++ b/docker/services/swift-storage.yaml
@@ -62,7 +62,7 @@ outputs:
         config_volume: swift
         puppet_tags: swift_config,swift_container_config,swift_container_sync_realms_config,swift_account_config,swift_object_config,swift_object_expirer_config
         step_config: *step_config
-        config_image:
+        config_image: &swift_proxy_image
           list_join:
             - '/'
             - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
@@ -99,7 +99,7 @@ outputs:
           # volume during the configuration stage.  We just need to create this
           # directory and make sure it's owned by swift.
           swift_setup_srv:
-            image:
+            image: &swift_account_image
               list_join:
                 - '/'
                 - [ {get_param: DockerNamespace}, {get_param: DockerSwiftAccountImage} ]
@@ -109,10 +109,7 @@ outputs:
               - /srv/node:/srv/node
         step_4:
           swift_account_auditor:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftAccountImage} ]
+            image: *swift_account_image
             net: host
             user: swift
             restart: always
@@ -128,10 +125,7 @@ outputs:
             environment: &kolla_env
               - KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
           swift_account_reaper:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftAccountImage} ]
+            image: *swift_account_image
             net: host
             user: swift
             restart: always
@@ -146,10 +140,7 @@ outputs:
               - /dev:/dev
             environment: *kolla_env
           swift_account_replicator:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftAccountImage} ]
+            image: *swift_account_image
             net: host
             user: swift
             restart: always
@@ -164,10 +155,7 @@ outputs:
               - /dev:/dev
             environment: *kolla_env
           swift_account_server:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftAccountImage} ]
+            image: *swift_account_image
             net: host
             user: swift
             restart: always
@@ -182,7 +170,7 @@ outputs:
               - /dev:/dev
             environment: *kolla_env
           swift_container_auditor:
-            image:
+            image: &swift_container_image
               list_join:
                 - '/'
                 - [ {get_param: DockerNamespace}, {get_param: DockerSwiftContainerImage} ]
@@ -200,10 +188,7 @@ outputs:
               - /dev:/dev
             environment: *kolla_env
           swift_container_replicator:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftContainerImage} ]
+            image: *swift_container_image
             net: host
             user: swift
             restart: always
@@ -218,10 +203,7 @@ outputs:
               - /dev:/dev
             environment: *kolla_env
           swift_container_updater:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftContainerImage} ]
+            image: *swift_container_image
             net: host
             user: swift
             restart: always
@@ -236,10 +218,7 @@ outputs:
               - /dev:/dev
             environment: *kolla_env
           swift_container_server:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftContainerImage} ]
+            image: *swift_container_image
             net: host
             user: swift
             restart: always
@@ -254,7 +233,7 @@ outputs:
               - /dev:/dev
             environment: *kolla_env
           swift_object_auditor:
-            image:
+            image: &swift_object_image
               list_join:
                 - '/'
                 - [ {get_param: DockerNamespace}, {get_param: DockerSwiftObjectImage} ]
@@ -272,10 +251,7 @@ outputs:
               - /dev:/dev
             environment: *kolla_env
           swift_object_expirer:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
+            image: *swift_proxy_image
             net: host
             user: swift
             restart: always
@@ -290,10 +266,7 @@ outputs:
               - /dev:/dev
             environment: *kolla_env
           swift_object_replicator:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftObjectImage} ]
+            image: *swift_object_image
             net: host
             user: swift
             restart: always
@@ -308,10 +281,7 @@ outputs:
               - /dev:/dev
             environment: *kolla_env
           swift_object_updater:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftObjectImage} ]
+            image: *swift_object_image
             net: host
             user: swift
             restart: always
@@ -326,10 +296,7 @@ outputs:
               - /dev:/dev
             environment: *kolla_env
           swift_object_server:
-            image:
-              list_join:
-                - '/'
-                - [ {get_param: DockerNamespace}, {get_param: DockerSwiftObjectImage} ]
+            image: *swift_object_image
             net: host
             user: swift
             restart: always