diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-08-16 17:02:26 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-08-16 17:02:27 +0000 |
| commit | bed0f0f8d790ff9a1037815854e458dedd0bd304 (patch) | |
| tree | 9390c7408892d6cb166bb49b798731c6925f3b0c /docker | |
| parent | e3ca26f9e555e06e6588d7dca421a1d99563ee96 (diff) | |
| parent | 29fcb04cf38de41276b2b23e69e86d898efe5afb (diff) | |
| download | kolla-bed0f0f8d790ff9a1037815854e458dedd0bd304.tar.gz kolla-bed0f0f8d790ff9a1037815854e458dedd0bd304.zip | |
Merge "enhancements to install_packages macro"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/macros.j2 | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/docker/macros.j2 b/docker/macros.j2 index c10973ef6..5cdb12b4c 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -1,7 +1,12 @@ {% macro install_packages(packages) -%} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] -%} - yum -y install {{ packages | join(' ') }} && yum clean all + 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 + {#- + debian_package_install is a utility method to build up an appropriate + set of commands to install packages in a debian-based environment that + may include URL links to a .deb package (e.g, heka) + -#} + {{ debian_package_install(packages) }} {%- endif %} {%- endmacro %} |