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 2f2a06929f..b035e33ccc 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
@@ -200,14 +194,9 @@ _opts = [
      list(itertools.chain(manila.network.neutron.api.neutron_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.volume.cinder.list_opts())
-_opts.extend(oslo_service.sslutils.list_opts())
 
 
 def list_opts():