Merge pull request #332 from thomas-mangin/T2230

template: T2230: use render to generate templates

1 files changed, 2 insertions, 12 deletions

diff --git a/src/conf_mode/ntp.py b/src/conf_mode/ntp.py
index 75328dfd7..a1a7befcb 100755
--- a/src/conf_mode/ntp.py
+++ b/src/conf_mode/ntp.py
@@ -18,13 +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 import ConfigError
 from vyos.util import call
+from vyos.util import render
 
 
 config_file = r'/etc/ntp.conf'
@@ -100,16 +99,7 @@ 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):