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/service.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/service.py')
| -rw-r--r-- | nova/service.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/nova/service.py b/nova/service.py index b9ad57943..47c88eede 100644 --- a/nova/service.py +++ b/nova/service.py @@ -45,16 +45,18 @@ flags.DEFINE_integer('report_interval', 10, flags.DEFINE_integer('periodic_interval', 60, 'seconds between running periodic tasks', lower_bound=1) -flags.DEFINE_string('ec2_manager', 'nova.api.manager.EC2Manager', - 'EC2 API service manager') flags.DEFINE_string('ec2_listen', "0.0.0.0", 'IP address for EC2 API to listen') flags.DEFINE_integer('ec2_listen_port', 8773, 'port for ec2 api to listen') -flags.DEFINE_string('osapi_manager', None, - 'OpenStack API service manager') flags.DEFINE_string('osapi_listen', "0.0.0.0", 'IP address for OpenStack API to listen') flags.DEFINE_integer('osapi_listen_port', 8774, 'port for os api to listen') +flags.DEFINE_string('metadata_manager', 'nova.api.manager.MetadataManager', + 'OpenStack metadata service manager') +flags.DEFINE_string('metadata_listen', "0.0.0.0", + 'IP address for metadata api to listen') +flags.DEFINE_integer('metadata_listen_port', 8775, + 'port for metadata api to listen') flags.DEFINE_string('api_paste_config', "api-paste.ini", 'File name for the paste.deploy config for nova-api') |