diff options
| author | Harald Jensås <hjensas@redhat.com> | 2019-10-16 15:30:28 +0000 |
|---|---|---|
| committer | Server Team CI Bot <josh.powers+server-team-bot@canonical.com> | 2019-10-16 15:30:28 +0000 |
| commit | fac98983187c0984aa79c569c4b76cab90fd6f47 (patch) | |
| tree | 74eb5b18773325968887a7e128c4e4197963c25b /cloudinit/sources | |
| parent | de03438c7afd80fa7598dcf5ef40085d65a116bf (diff) | |
| download | vyos-cloud-init-fac98983187c0984aa79c569c4b76cab90fd6f47.tar.gz vyos-cloud-init-fac98983187c0984aa79c569c4b76cab90fd6f47.zip | |
net: handle openstack dhcpv6-stateless configuration
Openstack subnets can be configured to use SLAAC by setting
ipv6_address_mode=dhcpv6-stateless. When this is the case
the sysconfig interface configuration should use
IPV6_AUTOCONF=yes and not set DHCPV6C=yes.
This change sets the subnets type property to the full
network['type'] from openstack metadata.
cloudinit/net/sysconfig.py and cloudinit/net/eni.py
are updated to support new subnet types:
- 'ipv6_dhcpv6-stateless' => IPV6_AUTOCONF=yes
- 'ipv6_dhcpv6-stateful' => DHCPV6C=yes
Type 'dhcp6' in sysconfig is kept for backward compatibility
with any implementations that set subnet_type == 'dhcp6'.
LP: #1847517
Diffstat (limited to 'cloudinit/sources')
| -rw-r--r-- | cloudinit/sources/helpers/openstack.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cloudinit/sources/helpers/openstack.py b/cloudinit/sources/helpers/openstack.py index 8f069115..d1c4601a 100644 --- a/cloudinit/sources/helpers/openstack.py +++ b/cloudinit/sources/helpers/openstack.py @@ -585,7 +585,8 @@ def convert_net_json(network_json=None, known_macs=None): subnet = dict((k, v) for k, v in network.items() if k in valid_keys['subnet']) if 'dhcp' in network['type']: - t = 'dhcp6' if network['type'].startswith('ipv6') else 'dhcp4' + t = (network['type'] if network['type'].startswith('ipv6') + else 'dhcp4') subnet.update({ 'type': t, }) |