template: T2230: use render to generate templates

convert all call to jinja to use template.render

1 files changed, 3 insertions, 12 deletions

diff --git a/src/conf_mode/dynamic_dns.py b/src/conf_mode/dynamic_dns.py
index b54d76b06..b76503419 100755
--- a/src/conf_mode/dynamic_dns.py
+++ b/src/conf_mode/dynamic_dns.py
@@ -18,13 +18,12 @@ import os
 
 from sys import exit
 from copy import deepcopy
-from jinja2 import FileSystemLoader, Environment
 from stat import S_IRUSR, S_IWUSR
 
 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.template import render
 
 
 config_file = r'/etc/ddclient/ddclient.conf'
@@ -226,11 +225,6 @@ def generate(dyndns):
 
         return None
 
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'dynamic-dns')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
     dirname = os.path.dirname(dyndns['pid_file'])
     if not os.path.exists(dirname):
         os.mkdir(dirname)
@@ -239,11 +233,8 @@ def generate(dyndns):
     if not os.path.exists(dirname):
         os.mkdir(dirname)
 
-    tmpl = env.get_template('ddclient.conf.tmpl')
-    config_text = tmpl.render(dyndns)
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'dynamic-dns/ddclient.conf.tmpl', dyndns)
+    
     # Config file must be accessible only by its owner
     os.chmod(config_file, S_IRUSR | S_IWUSR)