diff options
| author | Dan Prince <dan.prince@rackspace.com> | 2011-03-24 13:27:41 -0400 |
|---|---|---|
| committer | Dan Prince <dan.prince@rackspace.com> | 2011-03-24 13:27:41 -0400 |
| commit | 6e434be0506b11780aa791e1c40de1d4ca4fb9ef (patch) | |
| tree | 47b3eb589ea77922101661b1e8560c15c9d8dc81 /nova/flags.py | |
| parent | 12184874da4369891b2eae49982623fc6c9315e3 (diff) | |
| parent | ab997441766f3d7454706ea9d630958287f53f01 (diff) | |
| download | nova-6e434be0506b11780aa791e1c40de1d4ca4fb9ef.tar.gz nova-6e434be0506b11780aa791e1c40de1d4ca4fb9ef.tar.xz nova-6e434be0506b11780aa791e1c40de1d4ca4fb9ef.zip | |
Merge w/ trunk.
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/flags.py b/nova/flags.py index 63e4cb5b6..00868d9b9 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -360,5 +360,6 @@ DEFINE_string('node_availability_zone', 'nova', 'availability zone of this node') DEFINE_string('zone_name', 'nova', 'name of this zone') -DEFINE_string('zone_capabilities', 'kypervisor:xenserver;os:linux', - 'Key/Value tags which represent capabilities of this zone') +DEFINE_list('zone_capabilities', + ['hypervisor=xenserver;kvm', 'os=linux;windows'], + 'Key/Multi-value list representng capabilities of this zone') |