Merge ~ltrager/maas:lp1768534 into maas:master
Proposed by
Lee Trager
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Lee Trager | ||||
Approved revision: | 7ed4665ea829616de805d2596019377d395d3d25 | ||||
Merge reported by: | MAAS Lander | ||||
Merged at revision: | not available | ||||
Proposed branch: | ~ltrager/maas:lp1768534 | ||||
Merge into: | maas:master | ||||
Diff against target: |
53 lines (+20/-6) 1 file modified
src/metadataserver/builtin_scripts/ntp.sh (+20/-6) |
||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Newell Jensen (community) | Approve | ||
Review via email: mp+345120@code.launchpad.net |
Commit message
LP: #1768534 - Fix NTP test when run with chrony or timesyncd
Description of the change
cloud-init now configures systems to use timesyncd by default. We can tell cloud-init to install chrony as well so this works for ntp, chrony, and timesyncd.
To post a comment you must log in.
Looks good.