diff options
author | 2017-03-06 10:32:52 +0000 | |
---|---|---|
committer | 2017-03-06 10:32:52 +0000 | |
commit | 47fcabee464b1e46490087316778b3cff0a55b5b (patch) | |
tree | f15d5fcafa2835131da9d13209930d98175cdfa9 /docker/services/swift-ringbuilder.yaml | |
parent | ccb13e7b4227188275cb3f8e599fa8f6f37639c0 (diff) | |
parent | 610850140d605b18f4a28099f160fff1e489443d (diff) |
Merge "Put docker puppet config in puppet_config dict"
Diffstat (limited to 'docker/services/swift-ringbuilder.yaml')
-rw-r--r-- | docker/services/swift-ringbuilder.yaml | 11 |
1 files changed, 7 insertions, 4 deletions
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: {} |