allow-curtin-override-2.6 : lp:~blake-rouse/maas : Git : Code : MAAS

Get this branch:: git clone -b allow-curtin-override-2.6 https://git.launchpad.net/~blake-rouse/maas

Only Blake Rouse can upload to this branch. If you are Blake Rouse please log in for upload directions.

Branch merges

Merged into maas:2.6

Blake Rouse (community): Approve on 2019-07-19

Branch information

Name:: allow-curtin-override-2.6

Repository:: lp:~blake-rouse/maas

Recent commits

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

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.

7f420f4... by Blake Rouse on 2019-07-19

Fixes LP: #1836703 - Add additional Windows version so license keys can be specified.

Backport of 2661671555c49b3d751e5d08f044a8a2a49b23d3

9cf8277... by Alberto Donato on 2019-07-16

backport e832cade5f9619ad7b526c2af49b9ce48c6ef230 - LP: #1836769 - rsyslog: only listen on its own socket, not the system one (/dev/log)

0f7de1c... by Lee Trager on 2019-07-10

Backport of 36d5dd0 - LP: #1835289 - Fix error handling on the commissioning API.

The commissioning API was returning an exception instead or raising it. This
caused a 500 internal error with no readable error message. Fixing this
revealed the commissioning API cannot be used with embedded script YAML as
the commissioning API sets the script_type to commissioning. The form now
allows fields to be set as long as they match what is in the script YAML.

87e43e5... by Caleb Ellis on 2019-07-04