The initial fix is easy, but bug 1621615 changes sneaked in without a
unit test.
I'd really like a unit test of read_kernel_cmdline_config to accompany this
change.
Also, a change to 'DHCP6_CONTENT_1' in tests/unittests/test_net.py to contain
what we're currently expecting.
diff --git a/cloudinit/net/cmdline.py b/cloudinit/net/cmdline.py
index 4075a27..a077730 100644
--- a/cloudinit/net/cmdline.py
+++ b/cloudinit/net/cmdline.py
@@ -199,7 +199,7 @@ def read_kernel_cmdline_config(files=None, mac_addrs=None,
cmdline=None):
if data64:
return util.load_yaml(_b64dgz(data64))
- if 'ip=' not in cmdline:
+ if 'ip=' not in cmdline and 'ip6=' not in cmdline:
return None
** Summary changed:
- initramfs kernel configuration ignored if only ip6= on kernel command line
+ initramfs network configuration ignored if only ip6= on kernel command line
** Also affects: cloud-init (Ubuntu)
Importance: Undecided
Status: New
** Changed in: cloud-init (Ubuntu)
Importance: Undecided => Medium
** Changed in: cloud-init (Ubuntu)
Status: New => Confirmed
--
You received this bug notification because you are a member of Yahoo!
Engineering Team, which is subscribed to cloud-init.
https://bugs.launchpad.net/bugs/1639930
Title:
initramfs network configuration ignored if only ip6= on kernel command
line
Status in cloud-init:
Confirmed
Status in cloud-init package in Ubuntu:
Confirmed
Bug description:
In changes made under bug 1621615 (specifically a1cdebdea), we now
expect that there may be a 'ip6=' argument on the kernel command line.
The changes made did not test the case where there is 'ip6=' and no
'ip='.
The code currently will return with no network configuration found if
there is only ip6=...
Related bugs:
* bug 1621615: network not configured when ipv6 netbooted into cloud-init
* bug 1621507: initramfs-tools configure_networking() fails to dhcp IPv6
addresses
* bug 1635716: Can't bring up a machine on a dual network (ipv4 and ipv6)
To manage notifications about this bug go to:
https://bugs.launchpad.net/cloud-init/+bug/1639930/+subscriptions
--
Mailing list: https://launchpad.net/~yahoo-eng-team
Post to : [email protected]
Unsubscribe : https://launchpad.net/~yahoo-eng-team
More help : https://help.launchpad.net/ListHelp
