X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fservices%2Fswift-ringbuilder.yaml;h=2110250532e384fc2f56169a0fe49e0d860510c3;hb=d6adc5a5f2cf6e438b19dd32bd13d6d3c9701614;hp=de91e7cfd359fb00ba10850d43779e1d428a3658;hpb=ecfb2981124cd55f0cb6738fc8644c4b282dc0d5;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml
index de91e7cf..21102505 100644
--- a/docker/services/swift-ringbuilder.yaml
+++ b/docker/services/swift-ringbuilder.yaml
@@ -66,15 +66,17 @@ outputs:
     value:
       service_name: {get_attr: [SwiftRingbuilderBase, role_data, service_name]}
       config_settings: {get_attr: [SwiftRingbuilderBase, role_data, config_settings]}
-      step_config: {get_attr: [SwiftRingbuilderBase, role_data, step_config]}
+      step_config: &step_config
+        get_attr: [SwiftRingbuilderBase, role_data, step_config]
       service_config_settings: {get_attr: [SwiftRingbuilderBase, role_data, service_config_settings]}
-      puppet_tags: exec,ring_object_device,swift::ringbuilder::create,tripleo::profile::base::swift::add_devices,swift::ringbuilder::rebalance
       # BEGIN DOCKER SETTINGS
-      docker_image: &docker_image
-        list_join:
-          - '/'
-          - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
-      config_volume: 'swift'
-      config_image: *docker_image
+      puppet_config:
+        config_volume: 'swift'
+        puppet_tags: exec,ring_object_device,swift::ringbuilder::create,tripleo::profile::base::swift::add_devices,swift::ringbuilder::rebalance
+        step_config: *step_config
+        config_image:
+          list_join:
+            - '/'
+            - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ]
       kolla_config: {}
       docker_config: {}