summaryrefslogtreecommitdiffstats
path: root/nova/api
diff options
context:
space:
mode:
authorAnthony Young <sleepsonthefloor@gmail.com>2011-04-29 22:06:18 +0000
committerTarmac <>2011-04-29 22:06:18 +0000
commite2d77bf9d45c6370f5dda7176ec13db23666f314 (patch)
treeb79eeb7e4d808a937d0cb8670a30116213053557 /nova/api
parent9d76e52e4ac032973dd75d44e4978e7d42d33d40 (diff)
parentdc4beede6bda3b7db5ca5963cc6c48052d2b7c62 (diff)
Uses memcached to cache roles so that ldap is actually usable.
Diffstat (limited to 'nova/api')
-rw-r--r--nova/api/ec2/__init__.py6
1 files changed, 2 insertions, 4 deletions
diff --git a/nova/api/ec2/__init__.py b/nova/api/ec2/__init__.py
index e18e7f05e..cd59340bd 100644
--- a/nova/api/ec2/__init__.py
+++ b/nova/api/ec2/__init__.py
@@ -46,8 +46,6 @@ flags.DEFINE_integer('lockout_minutes', 15,
'Number of minutes to lockout if triggered.')
flags.DEFINE_integer('lockout_window', 15,
'Number of minutes for lockout window.')
-flags.DEFINE_list('lockout_memcached_servers', None,
- 'Memcached servers or None for in process cache.')
class RequestLogging(wsgi.Middleware):
@@ -107,11 +105,11 @@ class Lockout(wsgi.Middleware):
def __init__(self, application):
"""middleware can use fake for testing."""
- if FLAGS.lockout_memcached_servers:
+ if FLAGS.memcached_servers:
import memcache
else:
from nova import fakememcache as memcache
- self.mc = memcache.Client(FLAGS.lockout_memcached_servers,
+ self.mc = memcache.Client(FLAGS.memcached_servers,
debug=0)
super(Lockout, self).__init__(application)