Merge lp:~andreserl/maas/rsyslog_enlistment into lp:~maas-committers/maas/trunk
Proposed by
Andres Rodriguez
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Andres Rodriguez | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 4834 | ||||
Proposed branch: | lp:~andreserl/maas/rsyslog_enlistment | ||||
Merge into: | lp:~maas-committers/maas/trunk | ||||
Diff against target: |
102 lines (+26/-1) 5 files modified
contrib/preseeds_v2/enlist_userdata (+4/-0) src/maasserver/compose_preseed.py (+16/-0) src/maasserver/preseed.py (+2/-0) src/maasserver/tests/test_compose_preseed.py (+3/-0) src/maasserver/tests/test_preseed.py (+1/-1) |
||||
To merge this branch: | bzr merge lp:~andreserl/maas/rsyslog_enlistment | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Andres Rodriguez (community) | Approve | ||
Mike Pontillo (community) | Approve | ||
Review via email: mp+289992@code.launchpad.net |
Commit message
Add rsyslog support cloud-init logging during enlistment and commissioning (and the ephemeral environment in general).
Description of the change
This changes re-enables rsyslog for the enlistment environment, commissioning and the rest of the ephemeral environments for cloud-init ONLY. This only works on Xenial+ due to the version of cloud-init, but will NOT create any regressions to previous versions as cloud-init will just ignore the setting.
To post a comment you must log in.
Please get rid of the hard-coded port number before this lands and make it more DRY; I've suggested what to do below.