diff --git a/neutron/common/cache_utils.py b/neutron/common/cache_utils.py index 3220f43fd5e..9071be29bb1 100644 --- a/neutron/common/cache_utils.py +++ b/neutron/common/cache_utils.py @@ -21,23 +21,14 @@ from oslo_utils import reflection from six.moves.urllib import parse from neutron._i18n import _ +from neutron.conf import cache_utils as cache_utils_config -cache_opts = [ - cfg.StrOpt('cache_url', default='', - deprecated_for_removal=True, - help=_('URL to connect to the cache back end. ' - 'This option is deprecated in the Newton release and ' - 'will be removed. Please add a [cache] group for ' - 'oslo.cache in your neutron.conf and add "enable" and ' - '"backend" options in this section.')), -] - LOG = logging.getLogger(__name__) def register_oslo_configs(conf): - conf.register_opts(cache_opts) + cache_utils_config.register_cache_opts(conf) cache.configure(conf) diff --git a/neutron/conf/cache_utils.py b/neutron/conf/cache_utils.py new file mode 100644 index 00000000000..bde6918fa83 --- /dev/null +++ b/neutron/conf/cache_utils.py @@ -0,0 +1,31 @@ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or +# implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from oslo_config import cfg + +from neutron._i18n import _ + + +cache_opts = [ + cfg.StrOpt('cache_url', default='', + deprecated_for_removal=True, + help=_('URL to connect to the cache back end. ' + 'This option is deprecated in the Newton release and ' + 'will be removed. Please add a [cache] group for ' + 'oslo.cache in your neutron.conf and add "enable" and ' + '"backend" options in this section.')), +] + + +def register_cache_opts(cfg=cfg.CONF): + cfg.register_opts(cache_opts) diff --git a/neutron/opts.py b/neutron/opts.py index 7e1d4cf77e8..639e25453e1 100644 --- a/neutron/opts.py +++ b/neutron/opts.py @@ -25,11 +25,11 @@ import neutron.agent.linux.ra import neutron.agent.metadata.config import neutron.agent.ovsdb.api import neutron.agent.securitygroups_rpc -import neutron.common.cache_utils import neutron.conf.agent.dhcp import neutron.conf.agent.l3.config import neutron.conf.agent.l3.ha import neutron.conf.agent.ovs_conf +import neutron.conf.cache_utils import neutron.conf.common import neutron.conf.extensions.allowedaddresspairs import neutron.conf.plugins.ml2.drivers.agent @@ -222,7 +222,7 @@ def list_metadata_agent_opts(): neutron.agent.metadata.config.SHARED_OPTS, neutron.agent.metadata.config.METADATA_PROXY_HANDLER_OPTS, neutron.agent.metadata.config.UNIX_DOMAIN_METADATA_PROXY_OPTS, - neutron.common.cache_utils.cache_opts) + neutron.conf.cache_utils.cache_opts) ), ('AGENT', neutron.agent.common.config.AGENT_STATE_OPTS) ]