diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-18 06:18:20 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-18 06:18:21 +0000 |
| commit | 330d925ce4d01a0f793a68d5981862d68a8bd03a (patch) | |
| tree | d954cd14f3c959eddc5bba8cdc2327e246780982 | |
| parent | e48f68c82a4628829b47cffb35e706ce7147cec4 (diff) | |
| parent | f1c3422582ef3368647f3459b04c4c0b67f8e1ee (diff) | |
| download | kolla-330d925ce4d01a0f793a68d5981862d68a8bd03a.tar.gz kolla-330d925ce4d01a0f793a68d5981862d68a8bd03a.zip | |
Merge "Macro install packages"
| -rw-r--r-- | docker/macros.j2 | 7 | ||||
| -rwxr-xr-x | kolla/image/build.py | 8 |
2 files changed, 13 insertions, 2 deletions
diff --git a/docker/macros.j2 b/docker/macros.j2 new file mode 100644 index 000000000..c10973ef6 --- /dev/null +++ b/docker/macros.j2 @@ -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 %} diff --git a/kolla/image/build.py b/kolla/image/build.py index 301dea0d1..74c05b69b 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -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) |