1 files changed, 9 insertions, 21 deletions
diff --git a/src/conf_mode/vrrp.py b/src/conf_mode/vrrp.py
index d3e3710d1..b9b0405e2 100755
--- a/src/conf_mode/vrrp.py
+++ b/src/conf_mode/vrrp.py
@@ -18,16 +18,16 @@ import os
 
 from sys import exit
 from ipaddress import ip_address, ip_interface, IPv4Interface, IPv6Interface, IPv4Address, IPv6Address
-from jinja2 import FileSystemLoader, Environment
 from json import dumps
 from pathlib import Path
 
 import vyos.config
 import vyos.keepalived
 
-from vyos.defaults import directories as vyos_data_dir
 from vyos import ConfigError
-from vyos.util import run
+from vyos.util import call
+from vyos.template import render
+
 
 daemon_file = "/etc/default/keepalived"
 config_file = "/etc/keepalived/keepalived.conf"
@@ -201,11 +201,6 @@ def verify(data):
 
 
 def generate(data):
-    # Prepare Jinja2 template loader from files
-    tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'vrrp')
-    fs_loader = FileSystemLoader(tmpl_path)
-    env = Environment(loader=fs_loader)
-
     vrrp_groups, sync_groups = data
 
     # Remove disabled groups from the sync group member lists
@@ -217,16 +212,9 @@ def generate(data):
     # Filter out disabled groups
     vrrp_groups = list(filter(lambda x: x["disable"] is not True, vrrp_groups))
 
-    tmpl = env.get_template('keepalived.conf.tmpl')
-    config_text = tmpl.render({"groups": vrrp_groups, "sync_groups": sync_groups})
-    with open(config_file, 'w') as f:
-        f.write(config_text)
-
-    tmpl = env.get_template('daemon.tmpl')
-    config_text = tmpl.render()
-    with open(daemon_file, 'w') as f:
-        f.write(config_text)
-
+    render(config_file, 'vrrp/keepalived.conf.tmpl',
+           {"groups": vrrp_groups, "sync_groups": sync_groups})
+    render(daemon_file, 'vrrp/daemon.tmpl', {})
     return None
 
 
@@ -242,17 +230,17 @@ def apply(data):
 
         if not vyos.keepalived.vrrp_running():
             print("Starting the VRRP process")
-            ret = run("sudo systemctl restart keepalived.service")
+            ret = call("sudo systemctl restart keepalived.service")
         else:
             print("Reloading the VRRP process")
-            ret = run("sudo systemctl reload keepalived.service")
+            ret = call("sudo systemctl reload keepalived.service")
 
         if ret != 0:
             raise ConfigError("keepalived failed to start")
     else:
         # VRRP is removed in the commit
         print("Stopping the VRRP process")
-        run("sudo systemctl stop keepalived.service")
+        call("sudo systemctl stop keepalived.service")
         os.unlink(config_file)
 
     return None