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

[Nicolas Pochet]

[Pedro Guimarães (pguimaraes)]

review: Approve

diff --git a/config.yaml b/config.yaml
index 7f86798..3df2756 100644
--- a/config.yaml
+++ b/config.yaml
@@ -44,6 +44,8 @@ options:
     default: false
     type: boolean
     description: >
+        DEPRECATED - please DO NOT use if you have more than approximately
+        20 units in this service.
         Automatically select the most appropriate units in the service to
         be a service stratum connecting with upstream NTP servers, and use
         those units as time sources for the remaining units.
@@ -51,6 +53,8 @@ options:
     default: 6
     type: int
     description: >
+        DEPRECATED - please DO NOT use if you have more than approximately
+        20 units in this service.
         How many units should attempt to connect with upstream NTP servers?
   use_iburst:
     default: true
@@ -62,6 +66,14 @@ options:
     default: ""
     type: string
     description: >
+<<<<<<< config.yaml
         Setting as "ntp" will manually install NTPd package or "chrony" will
         install Chronyd package; disregard of the available OS version. If
         empty, it will take the version available for the OS
+=======
+        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.
+>>>>>>> config.yaml
diff --git a/lib/ntp_implementation.py b/lib/ntp_implementation.py
index 0ce4ac6..55abc3c 100644
--- a/lib/ntp_implementation.py
+++ b/lib/ntp_implementation.py
@@ -10,6 +10,7 @@ from charmhelpers.core.hookenv import (
 )
 import charmhelpers.contrib.templating.jinja as templating
 import charmhelpers.core.host
+import charmhelpers.core.hookenv
 import charmhelpers.osplatform
 import os.path
 import shutil
@@ -57,11 +58,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
@@ -140,9 +143,16 @@ def get_implementation(implementation_name=None):
     platform = charmhelpers.osplatform.get_platform()
     version = float(charmhelpers.core.host.lsb_release()['DISTRIB_RELEASE'])
 
+<<<<<<< lib/ntp_implementation.py
     if config_get('ntp_package') == "ntp":
         return NTPd()
     elif config_get('ntp_package') == "chrony":
+=======
+    ntp_package = charmhelpers.core.hookenv.config('ntp_package')
+    if ntp_package == "ntp":
+        return NTPd()
+    elif ntp_package == "chrony":
+>>>>>>> lib/ntp_implementation.py
         return Chronyd()
 
     if platform == 'ubuntu':