diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-03-06 10:32:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-03-06 10:32:52 +0000 |
| commit | 47fcabee464b1e46490087316778b3cff0a55b5b (patch) | |
| tree | f15d5fcafa2835131da9d13209930d98175cdfa9 /docker/services/swift-proxy.yaml | |
| parent | ccb13e7b4227188275cb3f8e599fa8f6f37639c0 (diff) | |
| parent | 610850140d605b18f4a28099f160fff1e489443d (diff) | |
Merge "Put docker puppet config in puppet_config dict"
Diffstat (limited to 'docker/services/swift-proxy.yaml')
| -rw-r--r-- | docker/services/swift-proxy.yaml | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml index 09553319..cdfefe2f 100644 --- a/docker/services/swift-proxy.yaml +++ b/docker/services/swift-proxy.yaml @@ -42,16 +42,19 @@ outputs: value: service_name: {get_attr: [SwiftProxyBase, role_data, service_name]} config_settings: {get_attr: [SwiftProxyBase, role_data, config_settings]} - step_config: {get_attr: [SwiftProxyBase, role_data, step_config]} + step_config: &step_config + get_attr: [SwiftProxyBase, role_data, step_config] service_config_settings: {get_attr: [SwiftProxyBase, role_data, service_config_settings]} # BEGIN DOCKER SETTINGS docker_image: &swift_proxy_image list_join: - '/' - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ] - puppet_tags: swift_proxy_config - config_volume: swift - config_image: *swift_proxy_image + puppet_config: + config_volume: swift + puppet_tags: swift_proxy_config + step_config: *step_config + config_image: *swift_proxy_image kolla_config: /var/lib/kolla/config_files/swift_proxy.json: command: /usr/bin/swift-proxy-server /etc/swift/proxy-server.conf |