diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-07-15 06:19:13 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-07-15 06:19:13 +0000 |
commit | 2185b835602ffb276b8142db68d472611fdf127a (patch) | |
tree | 50c351054ae33f3750e2a3a0a218432ddc6dcf02 /docker/services/swift-proxy.yaml | |
parent | 07a5fe1ba66cbad5afafbbd30d2d78129cb90bae (diff) | |
parent | e76d84f784d27a7a2d9e5f3a8b019f8254cb4d6c (diff) |
Merge "Use a single configuration file for specifying docker containers."
Diffstat (limited to 'docker/services/swift-proxy.yaml')
-rw-r--r-- | docker/services/swift-proxy.yaml | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/docker/services/swift-proxy.yaml b/docker/services/swift-proxy.yaml index 6ded962f..374db250 100644 --- a/docker/services/swift-proxy.yaml +++ b/docker/services/swift-proxy.yaml @@ -4,17 +4,11 @@ description: > OpenStack containerized swift proxy service parameters: - DockerNamespace: - description: namespace - default: 'tripleoupstream' - type: string DockerSwiftProxyImage: description: image - default: 'centos-binary-swift-proxy-server:latest' type: string DockerSwiftConfigImage: description: The container image to use for the swift config_volume - default: 'centos-binary-swift-proxy-server:latest' type: string EndpointMap: default: {} @@ -79,10 +73,7 @@ outputs: config_volume: swift puppet_tags: swift_proxy_config step_config: *step_config - config_image: - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerSwiftConfigImage} ] + config_image: {get_param: DockerSwiftConfigImage} kolla_config: /var/lib/kolla/config_files/swift_proxy.json: command: /usr/bin/swift-proxy-server /etc/swift/proxy-server.conf @@ -106,10 +97,7 @@ outputs: step_4: map_merge: - swift_proxy: - image: &swift_proxy_image - list_join: - - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ] + image: &swift_proxy_image {get_param: DockerSwiftProxyImage} net: host user: swift restart: always |