openstack/ironic
Code Issues Proposed changes

Use jinja rendering from utils module

Browse Source 
re-use utils.render_template function when building kernel options
for image.

Change-Id: I1f0cfe9ae7e30e76023f5891597cc14adfe3928f
This commit is contained in:
Pavlo Shchelokovskyy 2017-10-20 18:15:38 +03:00
parent 1b55698fab
commit e437970bca
1 changed files with 2 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ironic/common/images.py
View File

@ -24,7 +24,6 @@ import shutil
from ironic_lib import disk_utils
from ironic_lib import utils as ironic_utils
import jinja2
from oslo_concurrency import processutils
from oslo_log import log as logging
from oslo_utils import fileutils
@ -150,18 +149,8 @@ def _generate_cfg(kernel_params, template, options):
:returns: a string containing the contents of the isolinux configuration
file.
"""
if not kernel_params:
kernel_params = []
kernel_params_str = ' '.join(kernel_params)
tmpl_path, tmpl_file = os.path.split(template)
env = jinja2.Environment(loader=jinja2.FileSystemLoader(tmpl_path))
template = env.get_template(tmpl_file)
options.update({'kernel_params': kernel_params_str})
cfg = template.render(options)
return cfg
options.update({'kernel_params': ' '.join(kernel_params or [])})
return utils.render_template(template, options)
def create_isolinux_image_for_bios(output_file, kernel, ramdisk,