diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-07-14 23:11:34 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-07-14 23:11:34 +0000 |
commit | 07a5fe1ba66cbad5afafbbd30d2d78129cb90bae (patch) | |
tree | 1baecf44304a0c4a6459a1011312abfe65e6e5fd /docker/services/swift-ringbuilder.yaml | |
parent | 66e1d882505a3335e290d1943a2d2b15909fd73f (diff) | |
parent | baf6eee5016fac7004a7b8be6f78d4505f347aeb (diff) |
Merge "Adds network/cidr mapping into a new service property"
Diffstat (limited to 'docker/services/swift-ringbuilder.yaml')
-rw-r--r-- | docker/services/swift-ringbuilder.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/docker/services/swift-ringbuilder.yaml b/docker/services/swift-ringbuilder.yaml index 00a772d6..f51d6c77 100644 --- a/docker/services/swift-ringbuilder.yaml +++ b/docker/services/swift-ringbuilder.yaml @@ -12,6 +12,10 @@ parameters: description: The container image to use for the swift config_volume default: 'centos-binary-swift-proxy-server:latest' type: string + ServiceData: + default: {} + description: Dictionary packing service data + type: json ServiceNetMap: default: {} description: Mapping of service_name -> network name. Typically set @@ -73,6 +77,7 @@ resources: type: ../../puppet/services/swift-ringbuilder.yaml properties: EndpointMap: {get_param: EndpointMap} + ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} RoleName: {get_param: RoleName} |