openstack/neutron
Code Issues Proposed changes

Clean up the deprecated options for Xen API support

Browse Source 
This change cleans up the configuration options for Xen API support,
which was deprecated during the Wallaby cycle[1] and have been
ineffective.

[1] a6dbf97242

Change-Id: I89f304f767b2ec645ac7bb216890b6ac470fd875
This commit is contained in:
Takashi Kajinami 2021-04-23 22:28:36 +09:00
parent 98c934ef6a
commit 25d1f9b948
3 changed files with 5 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
neutron/conf/agent/xenapi_conf.py
View File

@ -1,47 +0,0 @@
# Copyright 2016 Citrix Systems.
# All Rights Reserved.
#
# 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 _
XENAPI_CONF_SECTION = 'xenapi'
XENAPI_DEPRECATION_REASON = ('XenAPI support has been removed from Nova, it '
'will be removed in X.')
XENAPI_OPTS = [
cfg.StrOpt('connection_url',
help=_("URL for connection to XenServer/Xen Cloud Platform."),
deprecated_for_removal=True,
deprecated_since='Wallaby',
deprecated_reason=XENAPI_DEPRECATION_REASON),
cfg.StrOpt('connection_username',
help=_("Username for connection to XenServer/Xen Cloud "
"Platform."),
deprecated_for_removal=True,
deprecated_since='Wallaby',
deprecated_reason=XENAPI_DEPRECATION_REASON),
cfg.StrOpt('connection_password',
help=_("Password for connection to XenServer/Xen Cloud "
"Platform."),
secret=True,
deprecated_for_removal=True,
deprecated_since='Wallaby',
deprecated_reason=XENAPI_DEPRECATION_REASON)
]
def register_xenapi_opts(cfg=cfg.CONF):
cfg.register_opts(XENAPI_OPTS, group=XENAPI_CONF_SECTION)

8
neutron/opts.py
View File

@ -31,7 +31,6 @@ import neutron.conf.agent.linux
import neutron.conf.agent.metadata.config as meta_conf
import neutron.conf.agent.ovs_conf
import neutron.conf.agent.ovsdb_api
import neutron.conf.agent.xenapi_conf
import neutron.conf.common
import neutron.conf.db.dvr_mac_db
import neutron.conf.db.extraroute_db
@ -342,10 +341,3 @@ def list_ironic_auth_opts():
opt_list.append(plugin_option)
opt_list.sort(key=operator.attrgetter('name'))
return [(IRONIC_GROUP, opt_list)]
def list_xenapi_opts():
return [
('xenapi',
neutron.conf.agent.xenapi_conf.XENAPI_OPTS)
]

5
releasenotes/notes/clean_up_xenapi_support-44694e3f9c29b8be.yaml Normal file
View File

@ -0,0 +1,5 @@
---
upgrade:
- |
The configuration options for XenAPI support has been removed, because
these options were already ineffective.