openstack/ironic
Code Issues Proposed changes

Merge "Drop netaddr - use netutils.is_valid_ipv6()"

Browse Source
This commit is contained in:
Zuul 2020-04-08 14:58:09 +00:00 committed by Gerrit Code Review
commit 44f776cda6
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ironic/common/neutron.py
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(

7
releasenotes/notes/dhcpv6-stateful-address-count-0f94ac6a55bd9e51.yaml
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>`_.