Merge ~pguimaraes/ntp-charm/+git/ntp-charm:master into ntp-charm:master

[Pedro Guimarães]

Added manual override on NTP package selection.
LP: #1817516

Added manual override on NTP package selection.
LP: #1817516

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[Joel Sing (jsing)]

review: Needs Fixing

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

1c8cbc9... by Pedro Guimarães on 2019-04-05

Removed unused config_get from lib/ntp_implementation.py

Unmerged commits

1c8cbc9... by Pedro Guimarães on 2019-04-05

Removed unused config_get from lib/ntp_implementation.py

da73241... by Pedro Guimarães on 2019-04-05

Merged changes from commit allow-ntp-choice

6e39713... by Nicolas Pochet on 2019-04-05

Code cleanup

8f68125... by Przemyslaw Hausman on 2019-02-26

Fix testing the value of ntp_package config option

c94981b... by Przemyslaw Hausman on 2019-02-26

Fix yaml parsing error due to the \t character used

65a8104... by Pedro Guimarães on 2019-02-25

Added manual override on NTP package selection.
LP: #1817516

2fe6f6c... by Przemyslaw Hausman on 2019-02-26

Fix testing the value of ntp_package config option

62be0f8... by Przemyslaw Hausman on 2019-02-26

Fix yaml parsing error due to the \t character used

6256555... by Pedro Guimarães on 2019-02-25

Added manual override on NTP package selection.
LP: #1817516

diff --git a/config.yaml b/config.yaml
index f9c541f..f7574a6 100644
--- a/config.yaml
+++ b/config.yaml
@@ -62,3 +62,12 @@ options:
     description: >
         Use iburst for all peers/sources, not just those received via the
         master relation.
+  ntp_package:
+    default: ""
+    type: string
+    description: >
+        If set to "ntp" the ntp package will be installed and configured, or if set to
+        "chrony" the chrony package will be installed and configured. If unspecified
+        the appropriate package will be selected based on the operating system.
+        Please note that the use of ntp on Ubuntu bionic or later is not recommended as it
+        does not receive security updates.
diff --git a/lib/ntp_implementation.py b/lib/ntp_implementation.py
index 3e20ccb..c524544 100644
--- a/lib/ntp_implementation.py
+++ b/lib/ntp_implementation.py
@@ -7,6 +7,7 @@
 
 import charmhelpers.contrib.templating.jinja as templating
 import charmhelpers.core.host
+import charmhelpers.core.hookenv
 import charmhelpers.osplatform
 import os.path
 import shutil
@@ -54,11 +55,13 @@ class NTPImplementation:
 
     def set_config(self, config):
         with open(self.config_file(), "w") as conffile:
-            conffile.write(templating.render(self._config_file_template(), config))
+            conffile.write(templating.render(
+                self._config_file_template(), config))
 
     def set_startup_options(self, config):
         with open(self._startup_config_file(), "w") as startup:
-            startup.write(templating.render(self._startup_template_file(), config))
+            startup.write(templating.render(
+                self._startup_template_file(), config))
 
     def _startup_config_file(self):
         raise NotImplementedError
@@ -137,6 +140,12 @@ def get_implementation(implementation_name=None):
     platform = charmhelpers.osplatform.get_platform()
     version = float(charmhelpers.core.host.lsb_release()['DISTRIB_RELEASE'])
 
+    ntp_package = charmhelpers.core.hookenv.config('ntp_package')
+    if ntp_package == "ntp":
+        return NTPd()
+    elif ntp_package == "chrony":
+        return Chronyd()
+
     if platform == 'ubuntu':
         if version > 18:
             # Ubuntu 18.04 or later: use chronyd