Merge lp:~jtv/maas/bug-1377005-zero-address into lp:~maas-committers/maas/trunk
Status: | Merged |
---|---|
Approved by: | Jeroen T. Vermeulen |
Approved revision: | no longer in the source branch. |
Merged at revision: | 3213 |
Proposed branch: | lp:~jtv/maas/bug-1377005-zero-address |
Merge into: | lp:~maas-committers/maas/trunk |
Diff against target: |
107 lines (+40/-15) 2 files modified
src/provisioningserver/drivers/osystem/debian_networking.py (+21/-5) src/provisioningserver/drivers/osystem/tests/test_debian_networking.py (+19/-10) |
To merge this branch: | bzr merge lp:~jtv/maas/bug-1377005-zero-address |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Graham Binns (community) | Approve | ||
Review via email: mp+237615@code.launchpad.net |
Commit message
Disable IPv4 in a new way: configure network interfaces with IP address of 0.0.0.0.
This unfortunately only seems to work in 14.04. But the previous way, of simply not configuring any IPv4, broke IPv6 networking on all nodes that had IPv4 disabled. The workaround was to configure IPv4 addresses anyway, and then remove them again in /etc/rc.local.
Description of the change
Deleting addresses in /etc/rc.local would give us the worst of both worlds: the code that generates the networking config would have to know each interface's IPv4 address, which it currently it doesn't; and there would still be a phase in the boot process where IPv4 was enabled.
Also, it would mean touching an additional file, and merely appending to /etc/rc.local wouldn't do: we'd need to insert a line before the final “exit 0” statement. There would also be a largish warning unless the command passed a netmask, and currently the generating code doesn't have this information.
Jeroen
One comment but looks good.