diff options
| author | Ilya Alekseyev <ilyaalekseyev@acm.org> | 2013-01-17 05:56:15 -0500 |
|---|---|---|
| committer | Ilya Alekseyev <ilyaalekseyev@acm.org> | 2013-01-23 08:49:16 -0500 |
| commit | 7d31c7b15d4c929e384df0e114db615448601cc3 (patch) | |
| tree | 594b9d26ab4424421b5d7a8d892d2613457a1a83 /bin/nova-api | |
| parent | a8a0826ea618266bb2cb0235c3efb354abb02c2e (diff) | |
Adds SSL support for API server.
Part of code in test for accessing with ipv6 and part of ssl
socket wrapping developed by Davanum Srinivas.
Original patch could be found here:
https://review.openstack.org/#/c/19559
DocImpact
Fixes bug 869884.
Change-Id: I6d60df77c3fb49552e597f94abae7f4d6f54044d
Diffstat (limited to 'bin/nova-api')
| -rwxr-xr-x | bin/nova-api | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/bin/nova-api b/bin/nova-api index 8457ea43d..16cf33cc5 100755 --- a/bin/nova-api +++ b/bin/nova-api @@ -44,13 +44,16 @@ from nova import utils CONF = cfg.CONF CONF.import_opt('enabled_apis', 'nova.service') +CONF.import_opt('enabled_ssl_apis', 'nova.service') if __name__ == '__main__': config.parse_args(sys.argv) logging.setup("nova") utils.monkey_patch() + launcher = service.ProcessLauncher() for api in CONF.enabled_apis: - server = service.WSGIService(api) + should_use_ssl = api in CONF.enabled_ssl_apis + server = service.WSGIService(api, use_ssl=should_use_ssl) launcher.launch_server(server, workers=server.workers or 1) launcher.wait() |