openstack
/
kolla
Code Issues Proposed changes

Merge "Macro install packages"

This commit is contained in:
Jenkins 2016-06-18 06:18:20 +00:00 committed by Gerrit Code Review
parent e48f68c82a f1c3422582
commit 330d925ce4
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/macros.j2 Normal file
View File

@ -0,0 +1,7 @@
{% macro install_packages(packages) -%}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] -%}
yum -y install {{ packages | join(' ') }} && yum clean all
{%- elif base_distro in ['ubuntu', 'debian'] -%}
apt-get -y install --no-install-recommends {{ packages | join(' ') }} && apt-get clean
{%- endif %}
{%- endmacro %}

8
kolla/image/build.py
View File

@ -626,8 +626,12 @@ class KollaWorker(object):
'kolla_version': kolla_version,
'rpm_setup': self.rpm_setup}
env = jinja2.Environment( # nosec: not used to render HTML
loader=jinja2.FileSystemLoader(path))
template = env.get_template(template_name)
loader=jinja2.FileSystemLoader(self.working_dir))
tpl_path = os.path.join(
os.path.relpath(path, self.working_dir),
template_name)
template = env.get_template(tpl_path)
if self.conf.template_override:
template_path = os.path.dirname(self.conf.template_override)
template_name = os.path.basename(self.conf.template_override)