diff options
| author | Scott Moser <smoser@brickies.net> | 2016-09-21 11:55:27 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@brickies.net> | 2016-09-21 11:55:27 -0400 |
| commit | f4eeca19cb8fc7d450f76ea2d8b2e19b6b73c52f (patch) | |
| tree | 357130e2c62b30a0d8ca2cec5c86d62466f12a18 /cloudinit | |
| parent | 9f5d2389c6339c718aedbe89f0e468c7b4e04c7b (diff) | |
| parent | 970dbd13f5ae40b0f95ea390b72d2b3426e8e4d9 (diff) | |
| download | vyos-cloud-init-f4eeca19cb8fc7d450f76ea2d8b2e19b6b73c52f.tar.gz vyos-cloud-init-f4eeca19cb8fc7d450f76ea2d8b2e19b6b73c52f.zip | |
merge from master at 0.7.8-4-g970dbd1
Diffstat (limited to 'cloudinit')
| -rw-r--r-- | cloudinit/net/cmdline.py | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/cloudinit/net/cmdline.py b/cloudinit/net/cmdline.py index 822a020b..933317d5 100644 --- a/cloudinit/net/cmdline.py +++ b/cloudinit/net/cmdline.py @@ -66,7 +66,9 @@ def _klibc_to_config_entry(content, mac_addrs=None): provided here. There is no good documentation on this unfortunately. DEVICE=<name> is expected/required and PROTO should indicate if - this is 'static' or 'dhcp'. + this is 'static' or 'dhcp' or 'dhcp6' (LP: #1621507). + note that IPV6PROTO is also written by newer code to address the + possibility of both ipv4 and ipv6 getting addresses. """ if mac_addrs is None: @@ -86,7 +88,7 @@ def _klibc_to_config_entry(content, mac_addrs=None): else: proto = 'static' - if proto not in ('static', 'dhcp'): + if proto not in ('static', 'dhcp', 'dhcp6'): raise ValueError("Unexpected value for PROTO: %s" % proto) iface = { @@ -98,12 +100,15 @@ def _klibc_to_config_entry(content, mac_addrs=None): if name in mac_addrs: iface['mac_address'] = mac_addrs[name] - # originally believed there might be IPV6* values - for v, pre in (('ipv4', 'IPV4'),): + # Handle both IPv4 and IPv6 values + for v, pre in (('ipv4', 'IPV4'), ('ipv6', 'IPV6')): # if no IPV4ADDR or IPV6ADDR, then go on. if pre + "ADDR" not in data: continue - subnet = {'type': proto, 'control': 'manual'} + + # PROTO for ipv4, IPV6PROTO for ipv6 + cur_proto = data.get(pre + 'PROTO', proto) + subnet = {'type': cur_proto, 'control': 'manual'} # these fields go right on the subnet for key in ('NETMASK', 'BROADCAST', 'GATEWAY'): |