diff --git a/neutron/conf/plugins/ml2/config.py b/neutron/conf/plugins/ml2/config.py index f3aa74c5bdd..cd56ee6794a 100644 --- a/neutron/conf/plugins/ml2/config.py +++ b/neutron/conf/plugins/ml2/config.py @@ -15,7 +15,6 @@ from neutron_lib import constants from oslo_config import cfg -from oslo_config import types from neutron._i18n import _ from neutron.common import _constants as common_const @@ -68,13 +67,14 @@ ml2_opts = [ "values for external_network_type config option depend " "on the network type values configured in type_drivers " "config option.")), - cfg.Opt('overlay_ip_version', - default=constants.IP_VERSION_4, - type=types.Integer(choices=[ - (constants.IP_VERSION_4, 'IPv4'), - (constants.IP_VERSION_6, 'IPv6') - ]), - help=_("IP version of all overlay (tunnel) network endpoints.")), + cfg.IntOpt('overlay_ip_version', + default=constants.IP_VERSION_4, + choices=[ + (constants.IP_VERSION_4, 'IPv4'), + (constants.IP_VERSION_6, 'IPv6') + ], + help=_("IP version of all overlay (tunnel) network " + "endpoints.")), cfg.StrOpt('tunnelled_network_rp_name', default=common_const.RP_TUNNELLED, help=_("Resource provider name for the host with tunnelled " diff --git a/requirements.txt b/requirements.txt index 101d4f3d578..8ca4deab8f0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,7 +26,7 @@ alembic>=1.6.5 # MIT stevedore>=2.0.1 # Apache-2.0 oslo.cache>=1.26.0 # Apache-2.0 oslo.concurrency>=3.26.0 # Apache-2.0 -oslo.config>=9.0.0 # Apache-2.0 +oslo.config>=9.4.0 # Apache-2.0 oslo.context>=2.22.0 # Apache-2.0 oslo.db>=4.44.0 # Apache-2.0 oslo.i18n>=3.20.0 # Apache-2.0