openstack
/
nova
Code Issues Proposed changes

Merge "Don't ignore template argument in get_injected_network_template"

This commit is contained in:
Jenkins 2015-06-01 21:49:30 +00:00 committed by Gerrit Code Review
parent f7912f9a9b 4da91eb43d
commit da418814e0
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/virt/netutils.py
View File

@ -170,7 +170,7 @@ def get_injected_network_template(network_info, use_ipv6=None, template=None,
if not nets:
return
tmpl_path, tmpl_file = os.path.split(CONF.injected_network_template)
tmpl_path, tmpl_file = os.path.split(template)
env = jinja2.Environment(loader=jinja2.FileSystemLoader(tmpl_path),
trim_blocks=True)
template = env.get_template(tmpl_file)