diff options
| author | Jenkins <jenkins@review.openstack.org> | 2011-11-16 23:35:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2011-11-16 23:35:08 +0000 |
| commit | 36dcc2d9230f8104f0defc8fa27ee8f6c2f2eeaf (patch) | |
| tree | b6fb06617cbcfbf985b7186a4e430b5f6cd75500 /nova/flags.py | |
| parent | 381e5e5b0dbbb6fefdc8194fa103176f18760060 (diff) | |
| parent | e6073532e5020203a8ec2247ca7ddd481c6ec517 (diff) | |
| download | nova-36dcc2d9230f8104f0defc8fa27ee8f6c2f2eeaf.tar.gz nova-36dcc2d9230f8104f0defc8fa27ee8f6c2f2eeaf.tar.xz nova-36dcc2d9230f8104f0defc8fa27ee8f6c2f2eeaf.zip | |
Merge "Separate metadata api into its own service"
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 9d6ef2a94..32cec119f 100644 --- a/nova/flags.py +++ b/nova/flags.py @@ -361,7 +361,7 @@ DEFINE_integer('rabbit_max_retries', 0, 'maximum rabbit connection attempts (0=try forever)') DEFINE_string('control_exchange', 'nova', 'the main exchange to connect to') DEFINE_boolean('rabbit_durable_queues', False, 'use durable queues') -DEFINE_list('enabled_apis', ['ec2', 'osapi'], +DEFINE_list('enabled_apis', ['ec2', 'osapi', 'metadata'], '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') @@ -377,7 +377,8 @@ DEFINE_integer('osapi_port', 8774, 'OpenStack API port') DEFINE_string('osapi_path', '/v1.1/', 'suffix for openstack') DEFINE_integer('osapi_max_limit', 1000, 'max number of items returned in a collection response') - +DEFINE_string('metadata_host', '$my_ip', 'ip of metadata server') +DEFINE_integer('metadata_port', 8775, 'Metadata API port') DEFINE_string('default_project', 'openstack', 'default project for openstack') DEFINE_string('default_image', 'ami-11111', 'default image to use, testing only') |