diff options
| author |   Eamonn O'Toole <eamonn.otoole@hp.com> | 2014-04-08 17:05:34 +0100 |
|---|---|---|
| committer | Eamonn O'Toole <eamonn.otoole@hp.com> | 2014-04-17 13:47:57 +0100 |
| commit | 9d49401bdc08119dfbbeb1b50eea65e5a3f02e99 (patch) | |
| tree | 52d3e0c71999ce7dcceffc4de58cb053e1c54401 /swift-storage-source.yaml | |
| parent | be5af1a35e6bbb9e517fd953a5fe0e2467676b91 (diff) | |
Adding Swift proxy-server memcache metadata
Swift proxy-servers use memcache to store and share metadata. This
change adds swift.proxy-memcache metadata to the swift-source and
swift-storage-source yaml templates modelled on the existing
swift.devices metadata. This metadata will be consumed by the
swift-proxy/os-config-applier/etc/swift/proxy-server.conf element
if the metadata exists.
Change-Id: If0b5724f69e7ec1c98e4dbdbeb9f08c4a18151b6
Diffstat (limited to 'swift-storage-source.yaml')
| -rw-r--r-- | swift-storage-source.yaml | 45 |
1 files changed, 33 insertions, 12 deletions
diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml index 69236b28..f20b2752 100644 --- a/swift-storage-source.yaml +++ b/swift-storage-source.yaml @@ -39,16 +39,37 @@ Resources: - ':%PORT%/d1' - Fn::Join: - ', ' - Merge::Map: - SwiftStorage0: - Fn::Join: - - '' - - - 'r1z1-' - - Fn::Select: - - 0 + - Merge::Map: + SwiftStorage0: + Fn::Join: + - '' + - - 'r1z1-' - Fn::Select: - - 'ctlplane' - - Fn::GetAtt: - - SwiftStorage0 - - networks - - ':%PORT%/d1' + - 0 + - Fn::Select: + - 'ctlplane' + - Fn::GetAtt: + - SwiftStorage0 + - networks + - ':%PORT%/d1' + swift_proxy_memcache: + Fn::Join: + - ', ' + - - Fn::Join: + - '' + - - {"Fn::Select": [ 0, {"Fn::Select": [ "ctlplane", {"Fn::GetAtt": [controller0, networks]} ]} ] } + - ':11211' + - Fn::Join: + - ', ' + - Merge::Map: + SwiftStorage0: + Fn::Join: + - '' + - - Fn::Select: + - 0 + - Fn::Select: + - 'ctlplane' + - Fn::GetAtt: + - SwiftStorage0 + - networks + - ':11211' |