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
This commit is contained in:
parent
be5af1a35e
commit
9d49401bdc
@ -43,3 +43,25 @@ Resources:
|
|||||||
- SwiftStorage0
|
- SwiftStorage0
|
||||||
- networks
|
- networks
|
||||||
- ':%PORT%/d1'
|
- ':%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'
|
||||||
|
|
||||||
|
@ -7,6 +7,7 @@ Resources:
|
|||||||
devices: { get_input: swift_devices }
|
devices: { get_input: swift_devices }
|
||||||
hash: { get_input: swift_hash_suffix }
|
hash: { get_input: swift_hash_suffix }
|
||||||
part-power: 10
|
part-power: 10
|
||||||
|
proxy-memcache: { get_input: swift_proxy_memcache }
|
||||||
replicas: 1
|
replicas: 1
|
||||||
service-password: { get_input: swift_password }
|
service-password: { get_input: swift_password }
|
||||||
neutron:
|
neutron:
|
||||||
|
@ -39,16 +39,37 @@ Resources:
|
|||||||
- ':%PORT%/d1'
|
- ':%PORT%/d1'
|
||||||
- Fn::Join:
|
- Fn::Join:
|
||||||
- ', '
|
- ', '
|
||||||
Merge::Map:
|
- Merge::Map:
|
||||||
SwiftStorage0:
|
SwiftStorage0:
|
||||||
Fn::Join:
|
Fn::Join:
|
||||||
- ''
|
- ''
|
||||||
- - 'r1z1-'
|
- - 'r1z1-'
|
||||||
- Fn::Select:
|
|
||||||
- 0
|
|
||||||
- Fn::Select:
|
- Fn::Select:
|
||||||
- 'ctlplane'
|
- 0
|
||||||
- Fn::GetAtt:
|
- Fn::Select:
|
||||||
- SwiftStorage0
|
- 'ctlplane'
|
||||||
- networks
|
- Fn::GetAtt:
|
||||||
- ':%PORT%/d1'
|
- 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'
|
||||||
|
Loading…
Reference in New Issue
Block a user