diff options
| author | William Wolf <throughnothing@gmail.com> | 2011-07-26 10:33:05 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-07-26 10:33:05 +0000 |
| commit | cb631be09c36d29ddb6e89a647c5161bc43c4aa7 (patch) | |
| tree | 5be2f5dfaeaee8dbc268f3c2f8cb26d56bd4b78d /nova/flags.py | |
| parent | 85522bba82a4139a89915bba99865a50fd9b8f58 (diff) | |
| parent | 5df221e970d8b060423034fa627735c5c24fce5d (diff) | |
| download | nova-cb631be09c36d29ddb6e89a647c5161bc43c4aa7.tar.gz nova-cb631be09c36d29ddb6e89a647c5161bc43c4aa7.tar.xz nova-cb631be09c36d29ddb6e89a647c5161bc43c4aa7.zip | |
Merge diablo-3 development from trunk (rev1322)
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/nova/flags.py b/nova/flags.py index 57a4ecf2f..49355b436 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -305,6 +305,8 @@ DEFINE_string('rabbit_virtual_host', '/', 'rabbit virtual host') DEFINE_integer('rabbit_retry_interval', 10, 'rabbit connection retry interval') DEFINE_integer('rabbit_max_retries', 12, 'rabbit connection attempts') DEFINE_string('control_exchange', 'nova', 'the main exchange to connect to') +DEFINE_list('enabled_apis', ['ec2', 'osapi'], + 'list of APIs to enable by default') DEFINE_string('ec2_host', '$my_ip', 'ip of api server') DEFINE_string('ec2_dmz_host', '$my_ip', 'internal ip of api server') DEFINE_integer('ec2_port', 8773, 'cloud controller port') |