openstack/nova
Code Issues Proposed changes

Move enabled_apis option into nova.service

Browse Source 
The enabled_apis option is only used in nova-api and nova-all but
there's no more obvious place to put it than nova.service. At least
this location is consistent, since we quite have a number of other
options related to the APIs in nova.service.

blueprint: scope-config-opts
Change-Id: I86e200fa5ad91ac0b7ab6837cc61e5927b2ebeb7
This commit is contained in:
Mark McLoughlin 2013-01-08 08:05:11 +00:00
parent 1db4b13d86
commit 41ef13a34c
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/nova-all
View File

@ -50,7 +50,7 @@ from nova.vnc import xvp_proxy
CONF = cfg.CONF
CONF.import_opt('enabled_apis', 'nova.config')
CONF.import_opt('enabled_apis', 'nova.service')
LOG = logging.getLogger('nova.all')
if __name__ == '__main__':

2
bin/nova-api
View File

@ -43,7 +43,7 @@ from nova import service
from nova import utils
CONF = cfg.CONF
CONF.import_opt('enabled_apis', 'nova.config')
CONF.import_opt('enabled_apis', 'nova.service')
if __name__ == '__main__':
config.parse_args(sys.argv)

3
nova/config.py
View File

@ -47,9 +47,6 @@ global_opts = [
cfg.StrOpt('my_ip',
default=_get_my_ip(),
help='ip address of this host'),
cfg.ListOpt('enabled_apis',
default=['ec2', 'osapi_compute', 'metadata'],
help='a list of APIs to enable by default'),
cfg.StrOpt('vpn_image_id',
default='0',
help='image id used when starting up a cloudpipe vpn server'),

3
nova/service.py
View File

@ -57,6 +57,9 @@ service_opts = [
help='range of seconds to randomly delay when starting the'
' periodic task scheduler to reduce stampeding.'
' (Disable by setting to 0)'),
cfg.ListOpt('enabled_apis',
default=['ec2', 'osapi_compute', 'metadata'],
help='a list of APIs to enable by default'),
cfg.StrOpt('ec2_listen',
default="0.0.0.0",
help='IP address for EC2 API to listen'),