diff options
| author | William Wolf <throughnothing@gmail.com> | 2011-05-02 18:07:30 -0400 |
|---|---|---|
| committer | William Wolf <throughnothing@gmail.com> | 2011-05-02 18:07:30 -0400 |
| commit | 64ebfab4cf8279a7ad8ffefebd6bc207aecb3122 (patch) | |
| tree | b49ecc53a5eee13c7458db393915eed3139711a8 /nova/flags.py | |
| parent | f99c5f60d202e84f5defb63e771f60d20cf43df9 (diff) | |
| parent | c069337734e99d5833b5a1814e33ffb1fbb5fff6 (diff) | |
| download | nova-64ebfab4cf8279a7ad8ffefebd6bc207aecb3122.tar.gz nova-64ebfab4cf8279a7ad8ffefebd6bc207aecb3122.tar.xz nova-64ebfab4cf8279a7ad8ffefebd6bc207aecb3122.zip | |
merge updates from trunk
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 3 |
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'], |