summaryrefslogtreecommitdiffstats
path: root/nova/service.py
diff options
context:
space:
mode:
authorAnthony Young <sleepsonthefloor@gmail.com>2012-01-09 14:02:02 -0800
committerAnthony Young <sleepsonthefloor@gmail.com>2012-01-13 09:06:55 -0800
commit60ff2e3b72b5a3c9200f8fc47aac01cdb610bdcf (patch)
treef3764b8c1f7d4247ad9bf653643e60e1b68fffb7 /nova/service.py
parent26de3426d471c447cef1bd8a1129027821136241 (diff)
downloadnova-60ff2e3b72b5a3c9200f8fc47aac01cdb610bdcf.tar.gz
nova-60ff2e3b72b5a3c9200f8fc47aac01cdb610bdcf.tar.xz
nova-60ff2e3b72b5a3c9200f8fc47aac01cdb610bdcf.zip
Implements blueprint separate-nova-volumeapi
* Moves openstack/v2 directory to compute and fixes tests accordingly * Moves some code from api/openstack/compute to shared location, for use by volume api * Implements basic volume functionality for types, volumes, and snapshots * Changes service name from osapi to osapi_compute (and adds osapi_volume) * Renames nova-api-os to nova-api-os-compute, adds nove-api-os-volume * Separate extension mechanism for compute and volume ** Removes flag osapi_extension and replaces with osapi_compute_extension and osapi_volume_extension * Updates the paste config * Fixes setup.py to include nova-os-api-compute and nova-os-api-volume * Fix bug in volume version code that occurred as result of trunk merge * Update integrated/test_volumes.py to use new endpoint Change-Id: I4c2e57c3cafd4e1a9e2ff3ce201c8cf28326afcd
Diffstat (limited to 'nova/service.py')
-rw-r--r--nova/service.py9
1 files changed, 7 insertions, 2 deletions
diff --git a/nova/service.py b/nova/service.py
index 95399f650..bfe6d1d54 100644
--- a/nova/service.py
+++ b/nova/service.py
@@ -48,9 +48,10 @@ flags.DEFINE_integer('periodic_interval', 60,
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_listen', "0.0.0.0",
+flags.DEFINE_string('osapi_compute_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_integer('osapi_compute_listen_port', 8774,
+ 'list port for osapi compute')
flags.DEFINE_string('metadata_manager', 'nova.api.manager.MetadataManager',
'OpenStack metadata service manager')
flags.DEFINE_string('metadata_listen', "0.0.0.0",
@@ -59,6 +60,10 @@ 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')
+flags.DEFINE_string('osapi_volume_listen', "0.0.0.0",
+ 'IP address for OpenStack Volume API to listen')
+flags.DEFINE_integer('osapi_volume_listen_port', 8776,
+ 'port for os volume api to listen')
class Launcher(object):