cloud-init-dev team mailing list archive

Thread
Date

[Merge] ~raharper/cloud-init:fix/debian-ntp-template into cloud-init:master

To: mp+370213@xxxxxxxxxxxxxxxxxx
From: Dan Watkins <daniel.watkins@xxxxxxxxxxxxx>
Date: Tue, 16 Jul 2019 19:41:03 -0000
In-reply-to: <156330511188.4315.13133933058113919183.launchpad@ackee.canonical.com>
Reply-to: mp+370213@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

The proposal to merge ~raharper/cloud-init:fix/debian-ntp-template into cloud-init:master has been updated.

Commit message changed to:

templates/ntp.conf.debian.tmpl: fix missing newline for pools

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

For more details, see:
https://code.launchpad.net/~raharper/cloud-init/+git/cloud-init/+merge/370213
-- 
Your team cloud-init commiters is requested to review the proposed merge of ~raharper/cloud-init:fix/debian-ntp-template into cloud-init:master.