summaryrefslogtreecommitdiffstats
path: root/nova/flags.py
diff options
context:
space:
mode:
authorYuriy Taraday <yorik.sar@gmail.com>2011-05-05 07:04:34 +0400
committerYuriy Taraday <yorik.sar@gmail.com>2011-05-05 07:04:34 +0400
commitda286df51e00a9ee8a0450ee8afbce27712151a7 (patch)
treea7ea4ad57bd6f358b3927e6c6b4d3e8a29f2cddf /nova/flags.py
parent36aa631dfdea4d2041df3a60d1a294f6a80807b7 (diff)
parent114a55d0243f79db7ea1ef29830a9428dbf1aa33 (diff)
Merged with current trunk.
Diffstat (limited to 'nova/flags.py')
-rw-r--r--nova/flags.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/nova/flags.py b/nova/flags.py
index 2357fc3a8..519793643 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -369,6 +369,9 @@ DEFINE_string('host', socket.gethostname(),
DEFINE_string('node_availability_zone', 'nova',
'availability zone of this node')
+DEFINE_list('memcached_servers', None,
+ 'Memcached servers or None for in process cache.')
+
DEFINE_string('zone_name', 'nova', 'name of this zone')
DEFINE_list('zone_capabilities',
['hypervisor=xenserver;kvm', 'os=linux;windows'],