Merge lp://qastaging/~mpontillo/maas/fix-1519177-1.8 into lp://qastaging/maas/1.8

Proposed by Mike Pontillo
Status: Merged
Approved by: Mike Pontillo
Approved revision: no longer in the source branch.
Merged at revision: 4056
Proposed branch: lp://qastaging/~mpontillo/maas/fix-1519177-1.8
Merge into: lp://qastaging/maas/1.8
Diff against target: 74 lines (+51/-2)
2 files modified
src/maasserver/models/macaddress.py (+23/-2)
src/maasserver/models/tests/test_macaddress.py (+28/-0)
To merge this branch: bzr merge lp://qastaging/~mpontillo/maas/fix-1519177-1.8
Reviewer Review Type Date Requested Status
Blake Rouse (community) Approve
Review via email: mp+278410@code.qastaging.launchpad.net

Commit message

Allow nodes to boot from unmanaged cluster interfaces using an off-link network (fixes MAAS with external DHCP in some scenarios).

Description of the change

This fixes a regression in MAAS 1.8 where we would crash rather than find an appropriate interface, given an UNMANAGED cluster interface.

I'm not landing this on trunk first, because the networking code is vastly different in 1.9 and trunk. I'll fix those next. (First I had to create this test setup on a known-working version of MAAS, but it turned out that was broken, too.)

To post a comment you must log in.
Revision history for this message
Blake Rouse (blake-rouse) wrote :

Looks good.

review: Approve
Revision history for this message
MAAS Lander (maas-lander) wrote :
Download full text (269.6 KiB)

The attempt to merge lp:~mpontillo/maas/fix-1519177-1.8 into lp:maas/1.8 failed. Below is the output from the failed tests.

Get:1 http://security.ubuntu.com trusty-security InRelease [64.4 kB]
Ign http://prodstack-zone-1.clouds.archive.ubuntu.com trusty InRelease
Get:2 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates InRelease [64.4 kB]
Get:3 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports InRelease [64.5 kB]
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release.gpg
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty Release
Get:4 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Sources [246 kB]
Get:5 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Sources [5,359 B]
Get:6 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe Sources [144 kB]
Get:7 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Sources [5,133 B]
Get:8 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [656 kB]
Get:9 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted amd64 Packages [15.9 kB]
Get:10 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [328 kB]
Get:11 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse amd64 Packages [13.0 kB]
Get:12 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/main Translation-en [321 kB]
Get:13 http://security.ubuntu.com trusty-security/main Sources [100.0 kB]
Get:14 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/multiverse Translation-en [6,730 B]
Get:15 http://security.ubuntu.com trusty-security/universe Sources [31.5 kB]
Get:16 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/restricted Translation-en [3,699 B]
Get:17 http://security.ubuntu.com trusty-security/main amd64 Packages [372 kB]
Get:18 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-updates/universe Translation-en [173 kB]
Get:19 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Sources [8,221 B]
Get:20 http://security.ubuntu.com trusty-security/universe amd64 Packages [120 kB]
Get:21 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted Sources [28 B]
Get:22 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe Sources [32.5 kB]
Get:23 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Sources [1,898 B]
Get:24 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main amd64 Packages [9,402 B]
Get:25 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/restricted amd64 Packages [28 B]
Get:26 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/universe amd64 Packages [38.5 kB]
Get:27 http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse amd64 Packages [1,571 B]
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/main Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubuntu.com trusty-backports/multiverse Translation-en
Hit http://prodstack-zone-1.clouds.archive.ubu...

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: