diff options
| author | Naveed Massjouni <naveedm9@gmail.com> | 2011-03-24 18:32:00 -0400 |
|---|---|---|
| committer | Naveed Massjouni <naveedm9@gmail.com> | 2011-03-24 18:32:00 -0400 |
| commit | 74c226c564d5357b8b09edc67cc0bdfec6b8d871 (patch) | |
| tree | e68bd07d29c3effbe7cd99c874d4eba08f74e75f /nova/flags.py | |
| parent | a6174e64b541560989c305b50787c96fb5890679 (diff) | |
| parent | f186c8ecc21cbcddf6e1e94053d6e250717852cb (diff) | |
| download | nova-74c226c564d5357b8b09edc67cc0bdfec6b8d871.tar.gz nova-74c226c564d5357b8b09edc67cc0bdfec6b8d871.tar.xz nova-74c226c564d5357b8b09edc67cc0bdfec6b8d871.zip | |
Merge from trunk
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/nova/flags.py b/nova/flags.py index d1817dc3b..f011ab383 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -298,6 +298,8 @@ DEFINE_string('ec2_dmz_host', '$my_ip', 'internal ip of api server') DEFINE_integer('ec2_port', 8773, 'cloud controller port') DEFINE_string('ec2_scheme', 'http', 'prefix for ec2') DEFINE_string('ec2_path', '/services/Cloud', 'suffix for ec2') +DEFINE_string('osapi_extensions_path', '/var/lib/nova/extensions', + 'default directory for nova extensions') DEFINE_string('osapi_host', '$my_ip', 'ip of api server') DEFINE_string('osapi_scheme', 'http', 'prefix for openstack') DEFINE_integer('osapi_port', 8774, 'OpenStack API port') @@ -360,5 +362,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') |