~raharper/cloud-init:bug-lp-1645644-ntp

Branch merges

Propose for merging

Merged into cloud-init:master at revision e11d3899d47ec5fcb545e0c7820af9d3995cb574

Server Team CI bot: Needs Fixing (continuous-integration) on 2017-05-12

Scott Moser: Needs Fixing on 2017-01-12

Diff: 352 lines (+183/-28)

8 files modified

cloudinit/config/cc_ntp.py (+22/-2)
tests/cloud_tests/configs/modules/ntp_pools.yaml (+6/-4)
tests/cloud_tests/configs/modules/ntp_servers.yaml (+10/-6)
tests/cloud_tests/testcases/modules/ntp.py (+2/-2)
tests/cloud_tests/testcases/modules/ntp_pools.py (+19/-6)
tests/cloud_tests/testcases/modules/ntp_servers.py (+14/-5)
tests/unittests/test_handler/test_handler_ntp.py (+76/-2)
tox.ini (+34/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related charm recipes

039fad4... by Ryan Harper on 2017-05-12

Merge branch 'bug-lp-1645644-ntp' of git.launchpad.net:~raharper/cloud-init into bug-lp-1645644-ntp

61fa4b0... by Ryan Harper on 2017-05-12

cloud_tests: ntp_pools: remove duplicate test I accidentally left in

Signed-off-by: Ryan Harper <email address hidden>

54f0ffe... by Ryan Harper on 2017-01-10

cloud_tests: update ntp tests to match cc_ntp behavior

cc_ntp handling was updated to ensure that we write out our
configuration template prior to installing so ntpd doesn't
attempt to contact a server that wasn't configured.

Add a new test to use ntpq to query which servers/pools are
used and that it matches the supplied cloud-config.

LP: #1645644

Signed-off-by: Ryan Harper <email address hidden>

1fdb0ec... by Ryan Harper on 2017-01-10

tox: update cittest to just take {posargs}

2571946... by Ryan Harper on 2017-01-12

cc_ntp: Add unittest to test for exception if restart fails

Add a unittest to ensure we raise an exception if we fail
when restarting ntp service.

Signed-off-by: Ryan Harper <email address hidden>

62e56aa... by Ryan Harper on 2017-01-12

Address merge feedback

Signed-off-by: Ryan Harper <email address hidden>

7ca55db... by Ryan Harper on 2017-01-11

test_handler_ntp: mock out systemd check

Signed-off-by: Ryan Harper <email address hidden>

09ae78f... by Ryan Harper on 2017-01-11

cloud_tests: ntp_pools: remove duplicate test I accidentally left in

Signed-off-by: Ryan Harper <email address hidden>

f22f661... by Ryan Harper on 2017-01-10

cloud_tests: update ntp tests to match cc_ntp behavior

cc_ntp handling was updated to ensure that we write out our
configuration template prior to installing so ntpd doesn't
attempt to contact a server that wasn't configured.

Add a new test to use ntpq to query which servers/pools are
used and that it matches the supplied cloud-config.

LP: #1645644

Signed-off-by: Ryan Harper <email address hidden>

06008d2... by Ryan Harper on 2017-05-12

cloud_test: add integration test

Signed-off-by: Ryan Harper <email address hidden>