openstack/manila
Code Issues Proposed changes

Use sslutils from oslo_service

Browse Source 
Remove duplicated code to handle SSL. The following config options
from [DEFAULT] are now deprecated:

- ssl_ca_file
- ssl_cert_file
- ssl_key_file

The options are replaced by:

- ca_file
- cert_file
- key_file

from the [ssl] section.

Change-Id: If8a1b1f7e961d35fca368f8c73ef8bcbd0718742
Closes-Bug: #1536592
This commit is contained in:
Thomas Bechtold 2016-03-07 16:03:41 +01:00 committed by Victoria Martinez de la Cruz
parent c86e7658af
commit 77a8b6cc54
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manila/opts.py
View File

@ -23,6 +23,7 @@ import oslo_concurrency.opts
import oslo_log._options import oslo_log._options
import oslo_middleware.opts import oslo_middleware.opts
import oslo_policy.opts import oslo_policy.opts
import oslo_service.sslutils
import manila.api.common import manila.api.common
import manila.api.middleware.auth import manila.api.middleware.auth
@ -187,6 +188,7 @@ _opts.extend(oslo_policy.opts.list_opts())
_opts.extend(manila.network.neutron.api.list_opts()) _opts.extend(manila.network.neutron.api.list_opts())
_opts.extend(manila.compute.nova.list_opts()) _opts.extend(manila.compute.nova.list_opts())
_opts.extend(manila.volume.cinder.list_opts()) _opts.extend(manila.volume.cinder.list_opts())
_opts.extend(oslo_service.sslutils.list_opts())
def list_opts(): def list_opts():