diff options
| author | Kei Masumoto <masumotok@nttdata.co.jp> | 2011-01-19 08:50:47 +0900 |
|---|---|---|
| committer | Kei Masumoto <masumotok@nttdata.co.jp> | 2011-01-19 08:50:47 +0900 |
| commit | 8c92638f89029e34717558e56aa1202958085d22 (patch) | |
| tree | 128b1e0629cb8796abf47a02862ed8f8169e03a7 /nova/flags.py | |
| parent | a0779f5df2829f91bdc944e7275f44bd831643cc (diff) | |
| parent | 8e6684a58eea3ecacdde99e1940d2ae351b8465c (diff) | |
| download | nova-8c92638f89029e34717558e56aa1202958085d22.tar.gz nova-8c92638f89029e34717558e56aa1202958085d22.tar.xz nova-8c92638f89029e34717558e56aa1202958085d22.zip | |
merged to trunk rev572
Diffstat (limited to 'nova/flags.py')
| -rw-r--r-- | nova/flags.py | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/nova/flags.py b/nova/flags.py index ef66c3f3a..81e2e36f9 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -254,14 +254,15 @@ 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_string('ec2_prefix', 'http', 'prefix for ec2') -DEFINE_string('os_prefix', 'http', 'prefix for openstack') -DEFINE_string('cc_host', '$my_ip', 'ip of api server') -DEFINE_string('cc_dmz', '$my_ip', 'internal ip of api server') -DEFINE_integer('cc_port', 8773, 'cloud controller port') +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') +DEFINE_string('ec2_scheme', 'http', 'prefix for ec2') +DEFINE_string('ec2_path', '/services/Cloud', 'suffix for ec2') +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') -DEFINE_string('ec2_suffix', '/services/Cloud', 'suffix for ec2') -DEFINE_string('os_suffix', '/v1.0/', 'suffix for openstack') +DEFINE_string('osapi_path', '/v1.0/', 'suffix for openstack') DEFINE_string('default_project', 'openstack', 'default project for openstack') DEFINE_string('default_image', 'ami-11111', |