From 51530366c29df5790b00f793f3d4bda9fecd26a0 Mon Sep 17 00:00:00 2001 From: Mark McLoughlin Date: Tue, 8 Jan 2013 08:05:11 +0000 Subject: [PATCH] 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 --- bin/nova-all | 2 +- bin/nova-api | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/nova-all b/bin/nova-all index 88b92a4c..2553f648 100755 --- a/bin/nova-all +++ b/bin/nova-all @@ -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__': diff --git a/bin/nova-api b/bin/nova-api index ceb7ca49..8457ea43 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -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)