lp:~andreserl/maas/lp1582323_2.1

Branch merges

Propose for merging

Merged into lp:maas/2.1 at revision 5561

Andres Rodriguez (community): Approve on 2016-12-06

Diff: 121 lines (+56/-12)

3 files modified

docs/changelog.rst (+18/-12)
src/provisioningserver/kernel_opts.py (+2/-0)
src/provisioningserver/tests/test_kernel_opts.py (+36/-0)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1582323: Commissioning fails when competing cloud metadata resides on disk

Critical

Fix Released

Link a bug report

Related blueprints

5562. By Andres Rodriguez on 2016-12-06

Fix CHANGELOG

5561. By Andres Rodriguez on 2016-12-06

Backport rev5586 from lp:maas: Select MAAS datasource specifically to ensure commissioning doesn't fail when competing cloud metadata resides on disk

5560. By Richard McCartney on 2016-12-05

[r=allenap][bug=1628054,1628058,1628126,1646160,1646162,1646163][author=ricgard] Backport: r5547 r5549, fixes FUJ and Device discovery issues

5559. By Lee Trager on 2016-12-01

[r=ltrager][bug=1637401][author=ltrager] Backport r5579 from trunk: During probe and enlist of virsh only power off and commission new nodes.

Previously probe_virsh_and_enlist would power off each node before requesting a new node row was created. If the machine already exists or there was some issue creating the new node row the node was still powered off. This meant reprobing a virsh host would power off all known nodes. Power off now only happens if a new row was successfully created, existing nodes are ignored and left untouched.

5558. By Gavin Panella on 2016-11-29

[r=allenap][bug=1639182][author=allenap] Backport r5573 from lp:maas: Log consistently on both Xenial and Yakkety.

Twisted is going through a transition and some of the work done in Xenial for Twisted 16.0 does not have the desired effect in Yakkety with Twisted 16.4, and vice-versa.

5557. By Andres Rodriguez on 2016-11-28

[r=blake-rouse][bug=][author=andreserl] Backport trunk r5567: Fix MANIFEST.in to work with Zesty's apparently broken setuptools.

MANIFEST.in's mini-language has "graft" and "prune" commands. Previously these were interpreted as glob patterns but newer setuptools treat them as directory names.

5556. By Andres Rodriguez on 2016-11-24

Add tag and upgrade changelog

5555. By Newell Jensen on 2016-11-23

[r=newell-jensen][bug=1516065][author=newell-jensen] Backport trunk r5565: Fix IPMI chassis config session timeout issue when configuring the boot device that is a cause some errors in older HP Proliant BMCs. Only error on PowerAuthErrors when configuring the IPMI chassis boot order.

5554. By Andres Rodriguez on 2016-11-22

Update CHANGELOG

5553. By Andres Rodriguez on 2016-11-22

Update CHANGELOG