From 5187f246947f46632c1f70b7e5900fcb2f4d33e4 Mon Sep 17 00:00:00 2001
From: Takashi Kajinami <tkajinam@redhat.com>
Date: Sat, 14 Aug 2021 22:40:09 +0900
Subject: [PATCH] Use oslo-config-generator conf to load options from libraries

... instead of importing library modules just to load options.

Change-Id: I55270b330d1fe98817df4d419e8c26c90440e3a6
(cherry picked from commit 7f35a177d3e65333a34188a41813ea6440301929)
(cherry picked from commit 5a19c63267bc3c8bf8449ee8ce84cdf700495e3e)
---
 etc/oslo-config-generator/manila.conf |  9 ++++++---
 manila/opts.py                        | 11 -----------
 2 files changed, 6 insertions(+), 14 deletions(-)

diff --git a/etc/oslo-config-generator/manila.conf b/etc/oslo-config-generator/manila.conf
index ed21caf556..b4a37e1f92 100644
--- a/etc/oslo-config-generator/manila.conf
+++ b/etc/oslo-config-generator/manila.conf
@@ -1,9 +1,12 @@
 [DEFAULT]
 output_file = etc/manila/manila.conf.sample
 namespace = manila
-namespace = oslo.messaging
-namespace = oslo.middleware.cors
-namespace = oslo.middleware.http_proxy_to_wsgi
+namespace = oslo.concurrency
 namespace = oslo.db
 namespace = oslo.db.concurrency
+namespace = oslo.log
+namespace = oslo.messaging
+namespace = oslo.middleware
+namespace = oslo.policy
+namespace = oslo.service.sslutils
 namespace = keystonemiddleware.auth_token
diff --git a/manila/opts.py b/manila/opts.py
index 0d0985fd04..3b4b1b8e0d 100644
--- a/manila/opts.py
+++ b/manila/opts.py
@@ -19,12 +19,6 @@ __all__ = [
 import copy
 import itertools
 
-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
 import manila.common.config
@@ -205,15 +199,10 @@ _opts = [
      list(itertools.chain(manila.image.glance.glance_opts))),
 ]
 
-_opts.extend(oslo_concurrency.opts.list_opts())
-_opts.extend(oslo_log._options.list_opts())
-_opts.extend(oslo_middleware.opts.list_opts())
-_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.image.glance.list_opts())
 _opts.extend(manila.volume.cinder.list_opts())
-_opts.extend(oslo_service.sslutils.list_opts())
 
 
 def list_opts():