Drop netaddr - use netutils.is_valid_ipv6()

Change I8c595830b8c7974c651a9e524b57a6540e4f3d1f
added a dependency on netaddr. Ironic did'nt directly
depend on netaddr prior to this.

This removes the use of netaddr, netutils.is_valid_ipv6()
is used instead.

Also update the releasenote to clarify that the support
for allocating multiple IPv6 addresses fixes provisioning
on DHCPv6-stateful networks.

Story: 2007315
Task: 39321
Change-Id: I976bf9cee6fd10736f9fc88ca816266651b979c6
This commit is contained in:
Harald Jensås 2020-04-07 15:30:18 +02:00
parent 45d9390187
commit 855b654cb4
2 changed files with 8 additions and 3 deletions

View File

@ -13,10 +13,10 @@
import copy import copy
from keystoneauth1 import loading as ks_loading from keystoneauth1 import loading as ks_loading
import netaddr
from neutronclient.common import exceptions as neutron_exceptions from neutronclient.common import exceptions as neutron_exceptions
from neutronclient.v2_0 import client as clientv20 from neutronclient.v2_0 import client as clientv20
from oslo_log import log from oslo_log import log
from oslo_utils import netutils
from oslo_utils import uuidutils from oslo_utils import uuidutils
import retrying import retrying
@ -247,7 +247,7 @@ def _add_ip_addresses_for_ipv6_stateful(context, port, client):
""" """
fixed_ips = port['port']['fixed_ips'] fixed_ips = port['port']['fixed_ips']
if (not fixed_ips if (not fixed_ips
or netaddr.IPAddress(fixed_ips[0]['ip_address']).version != 6): or not netutils.is_valid_ipv6(fixed_ips[0]['ip_address'])):
return return
subnet = client.show_subnet( subnet = client.show_subnet(

View File

@ -6,4 +6,9 @@ features:
cleaning, rescue or inspection. The new parameter cleaning, rescue or inspection. The new parameter
``[neutron]/dhcpv6_stateful_address_count`` controls the number of addresses ``[neutron]/dhcpv6_stateful_address_count`` controls the number of addresses
to allocate (Default: 4). to allocate (Default: 4).
fixes:
- |
The 'no address available' problem seen when network booting on
DHCPv6-stateful networks is fixed with the support for allocating multiple
IPv6 addresses. See `bug: 1861032
<https://bugs.launchpad.net/neutron/+bug/1861032>`_.