From 77a8b6cc546bf7a05174935f01c8db8b7de87151 Mon Sep 17 00:00:00 2001
From: Thomas Bechtold <tbechtold@suse.com>
Date: Mon, 7 Mar 2016 16:03:41 +0100
Subject: [PATCH] Use sslutils from oslo_service

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
---
 manila/opts.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/manila/opts.py b/manila/opts.py
index 04326d989b..e33fb6b9f2 100644
--- a/manila/opts.py
+++ b/manila/opts.py
@@ -23,6 +23,7 @@ import oslo_concurrency.opts
 import oslo_log._options
 import oslo_middleware.opts
 import oslo_policy.opts
+import oslo_service.sslutils
 
 import manila.api.common
 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.compute.nova.list_opts())
 _opts.extend(manila.volume.cinder.list_opts())
+_opts.extend(oslo_service.sslutils.list_opts())
 
 
 def list_opts():