diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2013-01-08 08:05:11 +0000 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2013-01-09 08:15:43 +0000 |
| commit | 41ef13a34c4fa41052ae72cc87e552dfd8ed91ba (patch) | |
| tree | 7ac2d786036dd22bb94a573b7a33807abdf1f634 /bin | |
| parent | 1db4b13d86d748d9619ea9ce37bb4663285468b5 (diff) | |
| download | nova-41ef13a34c4fa41052ae72cc87e552dfd8ed91ba.tar.gz nova-41ef13a34c4fa41052ae72cc87e552dfd8ed91ba.tar.xz nova-41ef13a34c4fa41052ae72cc87e552dfd8ed91ba.zip | |
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
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/nova-all | 2 | ||||
| -rwxr-xr-x | bin/nova-api | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bin/nova-all b/bin/nova-all index 88b92a4c6..2553f6487 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 ceb7ca496..8457ea43d 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) |