X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fswift-ringbuilder.yaml;h=e4e2c7d2c1c266d965863cbe274e80d66a080b69;hb=453f51f81a22b4cb5786e8352e55ff18d5929565;hp=075d8d7c90c6c0692d1bc2826277bf0f922580f7;hpb=11a97ec7430118bbf4a11c87eceb3adec40ea4ac;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml
index 075d8d7c..e4e2c7d2 100644
--- a/docker/services/swift-ringbuilder.yaml
+++ b/docker/services/swift-ringbuilder.yaml
@@ -4,14 +4,13 @@ description: >
   OpenStack Swift Ringbuilder
 
 parameters:
-  DockerNamespace:
-    description: namespace
-    default: 'tripleoupstream'
-    type: string
-  DockerSwiftProxyImage:
-    description: image
-    default: 'centos-binary-swift-proxy-server:latest'
+  DockerSwiftConfigImage:
+    description: The container image to use for the swift config_volume
     type: string
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -73,6 +72,7 @@ resources:
     type: ../../puppet/services/swift-ringbuilder.yaml
     properties:
       EndpointMap: {get_param: EndpointMap}
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       RoleName: {get_param: RoleName}
@@ -95,9 +95,6 @@ outputs:
         config_volume: 'swift'
         puppet_tags: exec,fetch_swift_ring_tarball,extract_swift_ring_tarball,ring_object_device,swift::ringbuilder::create,tripleo::profile::base::swift::add_devices,swift::ringbuilder::rebalance,create_swift_ring_tarball,upload_swift_ring_tarball
         step_config: *step_config
-        config_image:
-          list_join:
-            - '/'
-            - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
+        config_image: {get_param: DockerSwiftConfigImage}
       kolla_config: {}
       docker_config: {}