openstack/nova
Code Issues Proposed changes

Merge "Cleanup ec2/metadata/osapi address/port listen config option help"

Browse Source
This commit is contained in:
Jenkins 2013-12-02 19:25:56 +00:00 committed by Gerrit Code Review
commit 34960bbbcd
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
etc/nova/nova.conf.sample
View File

@ -193,19 +193,22 @@
# a list of APIs with enabled SSL (list value) # a list of APIs with enabled SSL (list value)
#enabled_ssl_apis= #enabled_ssl_apis=
# IP address for EC2 API to listen (string value) # The IP address on which the EC2 API will listen. (string
# value)
#ec2_listen=0.0.0.0 #ec2_listen=0.0.0.0
# port for ec2 api to listen (integer value) # The port on which the EC2 API will listen. (integer value)
#ec2_listen_port=8773 #ec2_listen_port=8773
# Number of workers for EC2 API service (integer value) # Number of workers for EC2 API service (integer value)
#ec2_workers=<None> #ec2_workers=<None>
# IP address for OpenStack API to listen (string value) # The IP address on which the OpenStack API will listen.
# (string value)
#osapi_compute_listen=0.0.0.0 #osapi_compute_listen=0.0.0.0
# port for osapi compute to listen (integer value) # The port on which the OpenStack API will listen. (integer
# value)
#osapi_compute_listen_port=8774 #osapi_compute_listen_port=8774
# Number of workers for OpenStack API service (integer value) # Number of workers for OpenStack API service (integer value)
@ -214,10 +217,12 @@
# OpenStack metadata service manager (string value) # OpenStack metadata service manager (string value)
#metadata_manager=nova.api.manager.MetadataManager #metadata_manager=nova.api.manager.MetadataManager
# IP address for metadata api to listen (string value) # The IP address on which the metadata API will listen.
# (string value)
#metadata_listen=0.0.0.0 #metadata_listen=0.0.0.0
# port for metadata api to listen (integer value) # The port on which the metadata API will listen. (integer
# value)
#metadata_listen_port=8775 #metadata_listen_port=8775
# Number of workers for metadata service (integer value) # Number of workers for metadata service (integer value)

12
nova/service.py
View File

@ -60,18 +60,18 @@ service_opts = [
help='a list of APIs with enabled SSL'), help='a list of APIs with enabled SSL'),
cfg.StrOpt('ec2_listen', cfg.StrOpt('ec2_listen',
default="0.0.0.0", default="0.0.0.0",
help='IP address for EC2 API to listen'), help='The IP address on which the EC2 API will listen.'),
cfg.IntOpt('ec2_listen_port', cfg.IntOpt('ec2_listen_port',
default=8773, default=8773,
help='port for ec2 api to listen'), help='The port on which the EC2 API will listen.'),
cfg.IntOpt('ec2_workers', cfg.IntOpt('ec2_workers',
help='Number of workers for EC2 API service'), help='Number of workers for EC2 API service'),
cfg.StrOpt('osapi_compute_listen', cfg.StrOpt('osapi_compute_listen',
default="0.0.0.0", default="0.0.0.0",
help='IP address for OpenStack API to listen'), help='The IP address on which the OpenStack API will listen.'),
cfg.IntOpt('osapi_compute_listen_port', cfg.IntOpt('osapi_compute_listen_port',
default=8774, default=8774,
help='port for osapi compute to listen'), help='The port on which the OpenStack API will listen.'),
cfg.IntOpt('osapi_compute_workers', cfg.IntOpt('osapi_compute_workers',
help='Number of workers for OpenStack API service'), help='Number of workers for OpenStack API service'),
cfg.StrOpt('metadata_manager', cfg.StrOpt('metadata_manager',
@ -79,10 +79,10 @@ service_opts = [
help='OpenStack metadata service manager'), help='OpenStack metadata service manager'),
cfg.StrOpt('metadata_listen', cfg.StrOpt('metadata_listen',
default="0.0.0.0", default="0.0.0.0",
help='IP address for metadata api to listen'), help='The IP address on which the metadata API will listen.'),
cfg.IntOpt('metadata_listen_port', cfg.IntOpt('metadata_listen_port',
default=8775, default=8775,
help='port for metadata api to listen'), help='The port on which the metadata API will listen.'),
cfg.IntOpt('metadata_workers', cfg.IntOpt('metadata_workers',
help='Number of workers for metadata service'), help='Number of workers for metadata service'),
cfg.StrOpt('compute_manager', cfg.StrOpt('compute_manager',