Merge "Use oslo-config-generator conf to load options from libraries"

This commit is contained in:
Zuul 2021-08-26 18:43:36 +00:00 committed by Gerrit Code Review
commit fb154955d5
2 changed files with 6 additions and 14 deletions

View File

@ -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

View File

@ -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
@ -209,15 +203,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():