diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-06-29 20:12:59 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-06-29 20:12:59 +0000 |
commit | e8d8eae59cf7fac1378ddb6dc78c847abb77c22f (patch) | |
tree | 2290212e2b6f529824dc499badfba578a892421b /docker/services/swift-storage.yaml | |
parent | 3b7de8a2514cf9b90ee7aec3365bfbf4547175ad (diff) | |
parent | a474ae82d5f157a48c997fb9df420442bd79dcbe (diff) |
Merge "Add heat parameter for all of config_volume images"
Diffstat (limited to 'docker/services/swift-storage.yaml')
-rw-r--r-- | docker/services/swift-storage.yaml | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/docker/services/swift-storage.yaml b/docker/services/swift-storage.yaml index 55aea208..011e6d42 100644 --- a/docker/services/swift-storage.yaml +++ b/docker/services/swift-storage.yaml @@ -24,6 +24,10 @@ parameters: description: image default: 'centos-binary-swift-object: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: {} description: Mapping of service endpoint -> protocol. Typically set @@ -84,10 +88,10 @@ outputs: config_volume: swift puppet_tags: swift_config,swift_container_config,swift_container_sync_realms_config,swift_account_config,swift_object_config,swift_object_expirer_config step_config: *step_config - config_image: &swift_proxy_image + config_image: list_join: - '/' - - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ] + - [ {get_param: DockerNamespace}, {get_param: DockerSwiftConfigImage} ] kolla_config: /var/lib/kolla/config_files/swift_account_auditor.json: command: /usr/bin/swift-account-auditor /etc/swift/account-server.conf @@ -286,7 +290,10 @@ outputs: - /var/log/containers/swift:/var/log/swift environment: *kolla_env swift_object_expirer: - image: *swift_proxy_image + image: &swift_proxy_image + list_join: + - '/' + - [ {get_param: DockerNamespace}, {get_param: DockerSwiftProxyImage} ] net: host user: swift restart: always |