Merge lp://staging/~paulgear/charms/trusty/ntpmaster/add-query-hosts-option into lp://staging/charms/trusty/ntpmaster

Proposed by Paul Gear
Status: Merged
Merged at revision: 18
Proposed branch: lp://staging/~paulgear/charms/trusty/ntpmaster/add-query-hosts-option
Merge into: lp://staging/charms/trusty/ntpmaster
Diff against target: 48 lines (+11/-0)
3 files modified
config.yaml (+4/-0)
hooks/ntpmaster_hooks.py (+2/-0)
templates/ntp.conf (+5/-0)
To merge this branch: bzr merge lp://staging/~paulgear/charms/trusty/ntpmaster/add-query-hosts-option
Reviewer Review Type Date Requested Status
Review Queue (community) automated testing Approve
Chris Glass (community) Approve
Stuart Bishop (community) Approve
Review via email: mp+301602@code.staging.launchpad.net

Description of the change

Adds an option to allow user-specified query hosts. We need this for our production environment, which uses ntpq -pn remotely for Nagios checks.

To post a comment you must log in.
Revision history for this message
Stuart Bishop (stub) wrote :

Looks good.

review: Approve
Revision history for this message
Kevin W Monroe (kwmonroe) wrote :

Thanks for the feature Paul! I'm adding ~landscape-charmers to the requested reviewers. This needs to be pushed to their namespace to become available in the store.

Landscape charmers, assuming you approve of this code change, please push with:

charm push <path to branch> cs:~landscape-charmers/trusty/ntpmaster

Revision history for this message
Chris Glass (tribaal) wrote :

Looks good! +1

review: Approve
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5716/

review: Approve (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5615/

review: Approve (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5616/

review: Approve (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5617/

review: Approve (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5618/

review: Approve (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5619/

review: Approve (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5620/

review: Approve (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5621/

review: Approve (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5622/

review: Approve (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5623/

review: Approve (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5624/

review: Approve (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5625/

review: Approve (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

The results (PASS) are in and available here: http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/5626/

review: Approve (automated testing)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: