← Back to team overview

cloud-init-dev team mailing list archive

Re: [Merge] ~harald-jensas/cloud-init:bug/1848690 into cloud-init:master

 


Diff comments:

> diff --git a/cloudinit/net/network_state.py b/cloudinit/net/network_state.py
> index c0c415d..4ee323d 100644
> --- a/cloudinit/net/network_state.py
> +++ b/cloudinit/net/network_state.py
> @@ -919,7 +919,7 @@ def is_ipv6_addr(address):
>  def subnet_is_ipv6(subnet):
>      """Common helper for checking network_state subnets for ipv6."""
>      # 'static6' or 'dhcp6'

Let's update the comment here to mention the two new types

> -    if subnet['type'].endswith('6'):
> +    if subnet['type'].endswith('6') or subnet['type'].startswith('ipv6'):
>          # This is a request for DHCPv6.
>          return True
>      elif subnet['type'] == 'static' and is_ipv6_addr(subnet.get('address')):


-- 
https://code.launchpad.net/~harald-jensas/cloud-init/+git/cloud-init/+merge/374351
Your team cloud-init Commiters is requested to review the proposed merge of ~harald-jensas/cloud-init:bug/1848690 into cloud-init:master.


References