1
=== modified file 'config.yaml'
2
--- config.yaml	2013-07-16 07:48:32 +0000
3
+++ config.yaml	2016-08-01 00:13:12 +0000
4
@@ -1,4 +1,8 @@
5
1
options:
1
options:
6
2
  query-hosts:
7
3
    type: string
8
4
    description: Comma-separated list of restrict clauses which are allowed to query the server for time monitoring purposes. e.g. "10.1.1.0 mask 255.255.255.0"
9
5
    default: ""
10
2
  source:
6
  source:
11
3
    type: string
7
    type: string
12
4
    description: Space separated list of NTP servers and options to use as source for time. Use LOCAL if the machine has no references but itself.
8
    description: Space separated list of NTP servers and options to use as source for time. Use LOCAL if the machine has no references but itself.
13
5
9
14
=== modified file 'hooks/ntpmaster_hooks.py'
15
--- hooks/ntpmaster_hooks.py	2016-06-17 12:38:49 +0000
16
+++ hooks/ntpmaster_hooks.py	2016-08-01 00:13:12 +0000
17
@@ -34,6 +34,7 @@
18
34
@host.restart_on_change({NTP_CONF: ['ntp']})
34
@host.restart_on_change({NTP_CONF: ['ntp']})
19
35
def write_config():
35
def write_config():
20
36
    source = hookenv.config('source')
36
    source = hookenv.config('source')
21
37
    query_hosts = hookenv.config('query-hosts').split(',')
22
37
    remote_sources = []
38
    remote_sources = []
23
38
    peers = []
39
    peers = []
24
39
    local_time = False
40
    local_time = False
25
@@ -54,6 +55,7 @@
26
54
        ntp_context = {
55
        ntp_context = {
27
55
            'fudge_line': local_time,
56
            'fudge_line': local_time,
28
56
            'peers': peers,
57
            'peers': peers,
29
58
            'query_hosts': query_hosts,
30
57
            'servers': remote_sources,
59
            'servers': remote_sources,
31
58
        }
60
        }
32
59
        with open(NTP_CONF, "w") as ntpconf:
61
        with open(NTP_CONF, "w") as ntpconf:
33
60
62
34
=== modified file 'templates/ntp.conf'
35
--- templates/ntp.conf	2013-08-29 18:29:22 +0000
36
+++ templates/ntp.conf	2016-08-01 00:13:12 +0000
37
@@ -6,6 +6,11 @@
38
6
filegen clockstats file clockstats type day enable
6
filegen clockstats file clockstats type day enable
39
7
restrict -4 default kod notrap nomodify nopeer noquery
7
restrict -4 default kod notrap nomodify nopeer noquery
40
8
restrict -6 default kod notrap nomodify nopeer noquery
8
restrict -6 default kod notrap nomodify nopeer noquery
41
9
{% for qh in query_hosts %}
42
10
{% if qh -%}
43
11
restrict {{ qh }} nomodify notrap
44
12
{% endif -%}
45
13
{% endfor %}
46
9
restrict 127.0.0.1
14
restrict 127.0.0.1
47
10
restrict ::1
15
restrict ::1
48
11
# SERVERS
16
# SERVERS
Status:	Merged
Merged at revision:	18
Proposed branch:	lp:~paulgear/charms/trusty/ntpmaster/add-query-hosts-option
Merge into:	lp: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:~paulgear/charms/trusty/ntpmaster/add-query-hosts-option
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Review Queue (community)	automated testing		Approve on 2017-11-26
Chris Glass (community)		2016-08-25	Approve on 2016-08-25
Stuart Bishop (community)		2016-08-01	Approve on 2016-08-01
Review via email: mp+301602@code.launchpad.net