diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-01-09 19:55:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-01-09 19:55:50 +0000 |
| commit | f61b8216ecf61d20dd88d410a640331b192c30de (patch) | |
| tree | 4f50c8f2fb6da4cef2869c6fe4291e4efc02eddd /bin | |
| parent | 5eff7109b46e61c7193c76ef5ee97538fabba977 (diff) | |
| parent | 41ef13a34c4fa41052ae72cc87e552dfd8ed91ba (diff) | |
Merge "Move enabled_apis option into nova.service"
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) |