Merge "Swift proxy memcache authtoken additions"

2015-01-14 03:06:14 +00:00
parent a8d21539b7 2d1f4cc934
commit 2f253eaffe
1 changed files with 7 additions and 0 deletions
--- a/elements/swift-proxy/os-apply-config/etc/swift/proxy-server.conf
+++ b/elements/swift-proxy/os-apply-config/etc/swift/proxy-server.conf
@@ -44,6 +44,13 @@ admin_password = {{swift.service-password}}
 auth_uri = http://{{keystone.host}}:5000/v2.0
 delay_auth_decision = true
 identity_uri=http://{{keystone.host}}:35357
+{{#swift.proxy-memcache}}
+cache = swift.cache
+{{#swift.encrypt-authtoken}}
+memcache_security_strategy = ENCRYPT
+memcache_secret_key = {{swift.hash}}
+{{/swift.encrypt-authtoken}}
+{{/swift.proxy-memcache}}

 [filter:keystoneauth]
 use = egg:swift#keystoneauth