1
diff --git a/config.yaml b/config.yaml
2
index f9c541f..f7574a6 100644
3
--- a/config.yaml
4
+++ b/config.yaml
5
@@ -62,3 +62,12 @@ options:
6
62
    description: >
62
    description: >
7
63
        Use iburst for all peers/sources, not just those received via the
63
        Use iburst for all peers/sources, not just those received via the
8
64
        master relation.
64
        master relation.
9
65
  ntp_package:
10
66
    default: ""
11
67
    type: string
12
68
    description: >
13
69
        If set to "ntp" the ntp package will be installed and configured, or if set to
14
70
        "chrony" the chrony package will be installed and configured. If unspecified
15
71
        the appropriate package will be selected based on the operating system.
16
72
        Please note that the use of ntp on Ubuntu bionic or later is not recommended as it
17
73
        does not receive security updates.
18
diff --git a/lib/ntp_implementation.py b/lib/ntp_implementation.py
19
index 3e20ccb..c524544 100644
20
--- a/lib/ntp_implementation.py
21
+++ b/lib/ntp_implementation.py
22
@@ -7,6 +7,7 @@
23
7
7
24
8
import charmhelpers.contrib.templating.jinja as templating
8
import charmhelpers.contrib.templating.jinja as templating
25
9
import charmhelpers.core.host
9
import charmhelpers.core.host
26
10
import charmhelpers.core.hookenv
27
10
import charmhelpers.osplatform
11
import charmhelpers.osplatform
28
11
import os.path
12
import os.path
29
12
import shutil
13
import shutil
30
@@ -54,11 +55,13 @@ class NTPImplementation:
31
54
55
32
55
    def set_config(self, config):
56
    def set_config(self, config):
33
56
        with open(self.config_file(), "w") as conffile:
57
        with open(self.config_file(), "w") as conffile:
35
57
            conffile.write(templating.render(self._config_file_template(), config))
58
            conffile.write(templating.render(
36
59
                self._config_file_template(), config))
37
58
60
38
59
    def set_startup_options(self, config):
61
    def set_startup_options(self, config):
39
60
        with open(self._startup_config_file(), "w") as startup:
62
        with open(self._startup_config_file(), "w") as startup:
41
61
            startup.write(templating.render(self._startup_template_file(), config))
63
            startup.write(templating.render(
42
64
                self._startup_template_file(), config))
43
62
65
44
63
    def _startup_config_file(self):
66
    def _startup_config_file(self):
45
64
        raise NotImplementedError
67
        raise NotImplementedError
46
@@ -137,6 +140,12 @@ def get_implementation(implementation_name=None):
47
137
    platform = charmhelpers.osplatform.get_platform()
140
    platform = charmhelpers.osplatform.get_platform()
48
138
    version = float(charmhelpers.core.host.lsb_release()['DISTRIB_RELEASE'])
141
    version = float(charmhelpers.core.host.lsb_release()['DISTRIB_RELEASE'])
49
139
142
50
143
    ntp_package = charmhelpers.core.hookenv.config('ntp_package')
51
144
    if ntp_package == "ntp":
52
145
        return NTPd()
53
146
    elif ntp_package == "chrony":
54
147
        return Chronyd()
55
148
56
140
    if platform == 'ubuntu':
149
    if platform == 'ubuntu':
57
141
        if version > 18:
150
        if version > 18:
58
142
            # Ubuntu 18.04 or later: use chronyd
151
            # Ubuntu 18.04 or later: use chronyd
Reviewer	Review Type	Date Requested	Status
Joel Sing (community)	+1	2019-04-05	Approve on 2019-06-13
Review via email: mp+365574@code.launchpad.net