ntp: T2185: store configuration in volatile /run area

(cherry picked from commit 3c33359d0c9700a1c80f1a222fe5f43642cd4fde)

4 files changed, 15 insertions, 7 deletions

diff --git a/data/templates/ntp/ntp.conf.tmpl b/data/templates/ntp/ntpd.conf.tmpl
index 2b56b53c3..2b56b53c3 100644
--- a/data/templates/ntp/ntp.conf.tmpl
+++ b/data/templates/ntp/ntpd.conf.tmpl
diff --git a/data/templates/ntp/override.conf.tmpl b/data/templates/ntp/override.conf.tmpl
index e0b947686..28eb61b21 100644
--- a/data/templates/ntp/override.conf.tmpl
+++ b/data/templates/ntp/override.conf.tmpl
@@ -1,11 +1,14 @@
 {% set vrf_command = 'ip vrf exec ' + vrf + ' ' if vrf is defined else '' %}
 [Unit]
 StartLimitIntervalSec=0
+ConditionPathExists={{config_file}}
 After=vyos-router.service
 
 [Service]
 ExecStart=
-ExecStart={{vrf_command}}/usr/lib/ntp/ntp-systemd-wrapper
+ExecStart={{vrf_command}}/usr/sbin/ntpd -g -p {{config_file | replace('.conf', '.pid') }} -c {{config_file}} -u ntp:ntp
+PIDFile=
+PIDFile={{config_file | replace('.conf', '.pid') }}
 Restart=always
 RestartSec=10
 
diff --git a/smoketest/scripts/cli/test_system_ntp.py b/smoketest/scripts/cli/test_system_ntp.py
index 986c8dfb2..edb6ad94d 100755
--- a/smoketest/scripts/cli/test_system_ntp.py
+++ b/smoketest/scripts/cli/test_system_ntp.py
@@ -26,7 +26,7 @@ from vyos.util import read_file
 from vyos.util import process_named_running
 
 PROCESS_NAME = 'ntpd'
-NTP_CONF = '/etc/ntp.conf'
+NTP_CONF = '/run/ntpd/ntpd.conf'
 base_path = ['system', 'ntp']
 
 def get_config_value(key):
@@ -47,6 +47,8 @@ class TestSystemNTP(unittest.TestCase):
         self.session.commit()
         del self.session
 
+        self.assertFalse(process_named_running(PROCESS_NAME))
+
     def test_ntp_options(self):
         # Test basic NTP support with multiple servers and their options
         servers = ['192.0.2.1', '192.0.2.2']
@@ -76,7 +78,7 @@ class TestSystemNTP(unittest.TestCase):
         self.assertTrue(process_named_running(PROCESS_NAME))
 
     def test_ntp_clients(self):
-        """ Test the allowed-networks statement """
+        # Test the allowed-networks statement
         listen_address = ['127.0.0.1', '::1']
         for listen in listen_address:
             self.session.set(base_path + ['listen-address', listen])
diff --git a/src/conf_mode/ntp.py b/src/conf_mode/ntp.py
index b102b3e9e..52070aabc 100755
--- a/src/conf_mode/ntp.py
+++ b/src/conf_mode/ntp.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 #
-# Copyright (C) 2018-2020 VyOS maintainers and contributors
+# Copyright (C) 2018-2021 VyOS maintainers and contributors
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License version 2 or later as
@@ -24,7 +24,7 @@ from vyos.template import render
 from vyos import airbag
 airbag.enable()
 
-config_file = r'/etc/ntp.conf'
+config_file = r'/run/ntpd/ntpd.conf'
 systemd_override = r'/etc/systemd/system/ntp.service.d/override.conf'
 
 def get_config(config=None):
@@ -33,8 +33,11 @@ def get_config(config=None):
     else:
         conf = Config()
     base = ['system', 'ntp']
+    if not conf.exists(base):
+        return None
 
     ntp = conf.get_config_dict(base, key_mangling=('-', '_'), get_first_key=True)
+    ntp['config_file'] = config_file
     return ntp
 
 def verify(ntp):
@@ -42,7 +45,7 @@ def verify(ntp):
     if not ntp:
         return None
 
-    if len(ntp.get('allow_clients', {})) and not (len(ntp.get('server', {})) > 0):
+    if 'allow_clients' in ntp and 'server' not in ntp:
         raise ConfigError('NTP server not configured')
 
     verify_vrf(ntp)
@@ -53,7 +56,7 @@ def generate(ntp):
     if not ntp:
         return None
 
-    render(config_file, 'ntp/ntp.conf.tmpl', ntp)
+    render(config_file, 'ntp/ntpd.conf.tmpl', ntp)
     render(systemd_override, 'ntp/override.conf.tmpl', ntp)
 
     return None