X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=docker%2Fservices%2Fswift-ringbuilder.yaml;h=027a695618f4d4e1e686f14c572f2a9361523d4e;hb=a4c8067eec098c2efe5409ae1c9df2f5dbfc842f;hp=de91e7cfd359fb00ba10850d43779e1d428a3658;hpb=8bd9652ca23019c95c4c8360592e9acf4b89fe86;p=apex-tripleo-heat-templates.git

diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml
index de91e7cf..027a6956 100644
--- a/docker/services/swift-ringbuilder.yaml
+++ b/docker/services/swift-ringbuilder.yaml
@@ -66,15 +66,18 @@ 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: *docker_image
       kolla_config: {}
       docker_config: {}