~blake-rouse/maas:fix-1836276-2.6

Branch merges

Propose for merging

Merged into maas:2.6

Blake Rouse (community): Approve on 2019-08-20

Diff: 475 lines (+135/-54)

8 files modified

src/maasserver/dhcp.py (+22/-11)
src/maasserver/tests/test_dhcp.py (+37/-1)
src/provisioningserver/dhcp/config.py (+38/-30)
src/provisioningserver/dhcp/testing/config.py (+6/-2)
src/provisioningserver/dhcp/tests/test_config.py (+24/-9)
src/provisioningserver/rpc/cluster.py (+1/-0)
src/provisioningserver/rpc/dhcp.py (+1/-0)
src/provisioningserver/rpc/tests/test_clusterservice.py (+6/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

70c1a2c... by Blake Rouse on 2019-08-19

Fixes LP: #1836276 - Select IP address from interface for shared network defined from the region controller, allowing relayed VLAN's to point to the correct IP address on the rack controller.

f73b1cc... by Newell Jensen on 2019-08-16

backport of f0331a265c1096ad7ee5cb1a24223b3c6b5813ff

LP: #1834500, #1468830 -- Mark previously deployed machines deployed when mark fixed. Allow marking a machine fixed if power is not on.

d56cfcf... by Blake Rouse on 2019-08-13

Fixes LP: #1710278 - Notice when bind9 is hung, force kill the service, ensure it starts again, then perform a reload.

Backport of d0a4ec6ce2af49d00431c0d7ad4c5164d3951e1a.

80c4959... by Lee Trager on 2019-08-08

LP: #1836293 - Install Debian packages with --no-install-recommends

Backport of edb6603

74f6896... by Adam Collard on 2019-07-26

Bump DEFAULT_VERSION to 2.6.1

a4c12e3... by Blake Rouse on 2019-07-26

Fix get_mac_addresses to ignore zero based mac addresses. Fix get_all_interfaces_definition to ignore zero based mac addresses.

Backport of 34631c2fe5062ac9078c8175d3fabf7eef394d8a

52f2b53... by Blake Rouse on 2019-07-26

Do not convert IPv4 addresses to IPv6 cast addresses.

Backport of 573da6972903c1b5566aad3012b97b09108d46eb

dbbc280... by Newell Jensen on 2019-07-24

Backport of d0a34d08f4b0fe245423939229daa3b71e0843a7

LP: #1806969 -- Explicitly search for bridges, bonds, followed by the remaining interfaces when retrieving a requested machine via interface constraints.

fc8c42d... by Lee Trager on 2019-07-20

Backport of 302d171 LP: #1835275 - Remove netplan interface lock.

Netplan creates a configuration file which locks the interface used to boot.
This ensures netbooted environments don't get disconnected. MAAS may send
a netplan configuration file which will reconfigure the boot interface. The
script runner will ensure the machine reconnects.

d4c3a71... by Conrad Hoffmann on 2019-07-19

Fixes LP: #1836867 - Change config merge order to allow overrides

The contains the user-supplied config from e.g.. Settings made in there are
expected to be passed to curtin as is. However, with other
(Maas-generated) configs being merged after it, values that the user set
explicitly may be overwritten by Maas.

Merging the last ensures that the user-supplied values
override the Maas-generated ones.

Backport of 396f0cc4ef741ed57bf247830b09df49974cd2cf.