Move enabled_apis option into nova.service

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 b31cc7fcc5
commit 51530366c2
2 changed files with 2 additions and 2 deletions

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__':

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)