1 files changed, 5 insertions, 16 deletions
diff --git a/src/conf_mode/ntp.py b/src/conf_mode/ntp.py
index 998022a8c..6d32f7fd6 100755
--- a/src/conf_mode/ntp.py
+++ b/src/conf_mode/ntp.py
@@ -18,14 +18,12 @@ import os
 
 from copy import deepcopy
 from ipaddress import ip_network
-from jinja2 import FileSystemLoader, Environment
 from sys import exit
 
 from vyos.config import Config
-from vyos.defaults import directories as vyos_data_dir
+from vyos.util import call
+from vyos.template import render
 from vyos import ConfigError
-from vyos.util import run
-
 
 config_file = r'/etc/ntp.conf'
 
@@ -100,24 +98,15 @@ def generate(ntp):
     if ntp is None:
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'ntp')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
-    tmpl = env.get_template('ntp.conf.tmpl')
-    config_text = tmpl.render(ntp)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'ntp/ntp.conf.tmpl', ntp)
     return None
 
 def apply(ntp):
     if ntp is not None:
-        run('sudo systemctl restart ntp.service')
+        call('sudo systemctl restart ntp.service')
     else:
         # NTP support is removed in the commit
-        run('sudo systemctl stop ntp.service')
+        call('sudo systemctl stop ntp.service')
         os.unlink(config_file)
 
     return None