diff options
| -rw-r--r-- | nova/cmd/all.py | 4 | ||||
| -rw-r--r-- | nova/cmd/api_ec2.py | 10 | ||||
| -rw-r--r-- | nova/cmd/api_metadata.py | 9 | ||||
| -rw-r--r-- | nova/cmd/api_os_compute.py | 9 |
4 files changed, 28 insertions, 4 deletions
diff --git a/nova/cmd/all.py b/nova/cmd/all.py index b4f7daf2a3..ebbfaddfe3 100644 --- a/nova/cmd/all.py +++ b/nova/cmd/all.py @@ -43,6 +43,7 @@ CONF = cfg.CONF CONF.import_opt('manager', 'nova.conductor.api', group='conductor') CONF.import_opt('topic', 'nova.conductor.api', group='conductor') CONF.import_opt('enabled_apis', 'nova.service') +CONF.import_opt('enabled_ssl_apis', 'nova.service') def main(): @@ -55,7 +56,8 @@ def main(): # nova-api for api in CONF.enabled_apis: try: - server = service.WSGIService(api) + should_use_ssl = api in CONF.enabled_ssl_apis + server = service.WSGIService(api, use_ssl=should_use_ssl) launcher.launch_service(server, workers=server.workers or 1) except (Exception, SystemExit): LOG.exception(_('Failed to load %s') % '%s-api' % api) diff --git a/nova/cmd/api_ec2.py b/nova/cmd/api_ec2.py index 2b3b942c8e..754d65d1a0 100644 --- a/nova/cmd/api_ec2.py +++ b/nova/cmd/api_ec2.py @@ -20,16 +20,24 @@ import sys +from oslo.config import cfg + from nova import config from nova.openstack.common import log as logging from nova import service from nova import utils +CONF = cfg.CONF +CONF.import_opt('enabled_ssl_apis', 'nova.service') + + def main(): config.parse_args(sys.argv) logging.setup("nova") utils.monkey_patch() - server = service.WSGIService('ec2', max_url_len=16384) + should_use_ssl = 'ec2' in CONF.enabled_ssl_apis + server = service.WSGIService('ec2', use_ssl=should_use_ssl, + max_url_len=16384) service.serve(server, workers=server.workers) service.wait() diff --git a/nova/cmd/api_metadata.py b/nova/cmd/api_metadata.py index ab235df57c..4c2f36edf1 100644 --- a/nova/cmd/api_metadata.py +++ b/nova/cmd/api_metadata.py @@ -20,16 +20,23 @@ import sys +from oslo.config import cfg + from nova import config from nova.openstack.common import log as logging from nova import service from nova import utils +CONF = cfg.CONF +CONF.import_opt('enabled_ssl_apis', 'nova.service') + + def main(): config.parse_args(sys.argv) logging.setup("nova") utils.monkey_patch() - server = service.WSGIService('metadata') + should_use_ssl = 'metadata' in CONF.enabled_ssl_apis + server = service.WSGIService('metadata', use_ssl=should_use_ssl) service.serve(server, workers=server.workers) service.wait() diff --git a/nova/cmd/api_os_compute.py b/nova/cmd/api_os_compute.py index 196abfef5e..956ce61062 100644 --- a/nova/cmd/api_os_compute.py +++ b/nova/cmd/api_os_compute.py @@ -20,16 +20,23 @@ import sys +from oslo.config import cfg + from nova import config from nova.openstack.common import log as logging from nova import service from nova import utils +CONF = cfg.CONF +CONF.import_opt('enabled_ssl_apis', 'nova.service') + + def main(): config.parse_args(sys.argv) logging.setup("nova") utils.monkey_patch() - server = service.WSGIService('osapi_compute') + should_use_ssl = 'osapi_compute' in CONF.enabled_ssl_apis + server = service.WSGIService('osapi_compute', use_ssl=should_use_ssl) service.serve(server, workers=server.workers) service.wait() |