openstack
/
neutron
Code Issues Proposed changes

Refactoring config options for cache_utils opts 

Refactoring neutron cache_utils config opts to be in neutron/conf so that all
the configuration options for cache_utils reside in a centralized location.
This simplifies the process of looking up the cache_utils config opts and
provides an easy way to import.

Change-Id: I722a2fa7d72c62e6d878d0137f899d09a9ad64ae
Partial-Bug: #1563069
This commit is contained in:
Anindita Das 2016-08-03 18:45:10 +00:00 committed by garyk
parent 57364544aa
commit d34bbf57cf
3 changed files with 35 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
neutron/common/cache_utils.py
View File

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

31
neutron/conf/cache_utils.py Normal file
View File

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

4
neutron/opts.py
View File

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