diff options
| author | Christian Poessinger <christian@poessinger.com> | 2020-04-12 21:07:53 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-12 21:07:53 +0200 |
| commit | 8978c7eaf4b1a89712242c8626a217024aae2f2b (patch) | |
| tree | 1248cd48ca5571d5d2098574ab932692767b5d2b /src/conf_mode/igmp_proxy.py | |
| parent | ad489280ba7f4511016883c24a6d0b06b6659df8 (diff) | |
| parent | 1fbaa2c59d0c0f43acad10db99d66b92fc520888 (diff) | |
| download | vyos-1x-8978c7eaf4b1a89712242c8626a217024aae2f2b.tar.gz vyos-1x-8978c7eaf4b1a89712242c8626a217024aae2f2b.zip | |
Merge pull request #332 from thomas-mangin/T2230
template: T2230: use render to generate templates
Diffstat (limited to 'src/conf_mode/igmp_proxy.py')
| -rwxr-xr-x | src/conf_mode/igmp_proxy.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/conf_mode/igmp_proxy.py b/src/conf_mode/igmp_proxy.py index 77e2bb150..9fa591a2c 100755 --- a/src/conf_mode/igmp_proxy.py +++ b/src/conf_mode/igmp_proxy.py @@ -18,13 +18,12 @@ import os from sys import exit from copy import deepcopy -from jinja2 import FileSystemLoader, Environment from netifaces import interfaces 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/igmpproxy.conf' @@ -116,16 +115,7 @@ def generate(igmp_proxy): print('Warning: IGMP Proxy will be deactivated because it is disabled') return None - # Prepare Jinja2 template loader from files - tmpl_path = os.path.join(vyos_data_dir['data'], 'templates', 'igmp-proxy') - fs_loader = FileSystemLoader(tmpl_path) - env = Environment(loader=fs_loader) - - tmpl = env.get_template('igmpproxy.conf.tmpl') - config_text = tmpl.render(igmp_proxy) - with open(config_file, 'w') as f: - f.write(config_text) - + render(config_file, 'igmp-proxy/igmpproxy.conf.tmpl', igmp_proxy) return None def apply(igmp_proxy): |