Merge ~raharper/cloud-init:fix/debian-ntp-template into cloud-init:master
Proposed by
Ryan Harper
| Status: | Merged |
|---|---|
| Approved by: | Ryan Harper |
| Approved revision: | d55a60ead5e1e9d17ff5a39d5cdb515d2d305131 |
| Merge reported by: | Server Team CI bot |
| Merged at revision: | not available |
| Proposed branch: | ~raharper/cloud-init:fix/debian-ntp-template |
| Merge into: | cloud-init:master |
| Diff against target: |
51 lines (+17/-11) 2 files modified
templates/ntp.conf.debian.tmpl (+2/-1) tests/unittests/test_handler/test_handler_ntp.py (+15/-10) |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Server Team CI bot | continuous-integration | Approve | |
| Dan Watkins | Approve | ||
|
Review via email:
|
|||
Commit message
templates/
The debian ntp.conf template did not contain a newline for the
comment used to mark the rendered ntp pools configured. This
resulted in an invalid line:
'# poolspool 0.int.pool.ntp.org iburst'
rather than:
'# pools
pool 0.int.pool.ntp.org iburst'
This patch fixes the template and updates the unittest to
verify that the rendered templates puts servers and pools
at the beginning of a line.
LP: #1836598
To post a comment you must log in.
Revision history for this message
| Server Team CI bot (server-team-bot) wrote | # |
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Server Team CI bot (server-team-bot) wrote | # |
review:
Approve
(continuous-integration)
There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
FAILED: Continuous integration, rev:fb7ba3846df
https:/
Executed test runs:
SUCCESS: Checkout
FAILED: Unit & Style Tests
Click here to trigger a rebuild:
https:/