summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEamonn O'Toole <eamonn.otoole@hp.com>2014-04-08 17:05:34 +0100
committerEamonn O'Toole <eamonn.otoole@hp.com>2014-04-17 13:47:57 +0100
commit9d49401bdc08119dfbbeb1b50eea65e5a3f02e99 (patch)
tree52d3e0c71999ce7dcceffc4de58cb053e1c54401
parentbe5af1a35e6bbb9e517fd953a5fe0e2467676b91 (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
-rw-r--r--swift-deploy.yaml22
-rw-r--r--swift-source.yaml1
-rw-r--r--swift-storage-source.yaml45
3 files changed, 56 insertions, 12 deletions
diff --git a/swift-deploy.yaml b/swift-deploy.yaml
index 1e96928f..3fe8eced 100644
--- a/swift-deploy.yaml
+++ b/swift-deploy.yaml
@@ -43,3 +43,25 @@ Resources:
- 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'
+
diff --git a/swift-source.yaml b/swift-source.yaml
index 1a17b770..90a956bf 100644
--- a/swift-source.yaml
+++ b/swift-source.yaml
@@ -7,6 +7,7 @@ Resources:
devices: { get_input: swift_devices }
hash: { get_input: swift_hash_suffix }
part-power: 10
+ proxy-memcache: { get_input: swift_proxy_memcache }
replicas: 1
service-password: { get_input: swift_password }
neutron:
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'