diff options
| author | Mark Goddard <mark@stackhpc.com> | 2020-03-06 15:07:26 +0000 |
|---|---|---|
| committer | Mark Goddard <mark@stackhpc.com> | 2020-03-25 13:39:09 +0000 |
| commit | 9d5a8fcd73e2b177609be64840757848f57a39cd (patch) | |
| tree | 862eddac0771ec8f77933bed71c34eccd2ab8b35 /docker | |
| parent | 052a9433659347a35d4f81b6a07bb83d97a17ad2 (diff) | |
| download | kolla-9d5a8fcd73e2b177609be64840757848f57a39cd.tar.gz kolla-9d5a8fcd73e2b177609be64840757848f57a39cd.zip | |
CentOS 8: Drop trickle install to build freezer
Trickle was previously installed from EPEL7, but is not available in
EPEL8. It does not appear critical to the functioning of freezer, so
drop it to allow freezer images to build for CentOS 8.
Change-Id: I3e12ab51e9f01d383268d75ce72903686564ada6
Partially-Implements: blueprint centos-rhel-8
(cherry picked from commit 548144fc3c2564c9c44a3a42372a1f3b8f2fef34)
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/freezer/freezer-base/Dockerfile.j2 | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/docker/freezer/freezer-base/Dockerfile.j2 b/docker/freezer/freezer-base/Dockerfile.j2 index 9b27fbdf1..450cca5f8 100644 --- a/docker/freezer/freezer-base/Dockerfile.j2 +++ b/docker/freezer/freezer-base/Dockerfile.j2 @@ -13,10 +13,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \ && /bin/false {% elif install_type == 'source' %} - {% set freezer_base_packages = [ - 'trickle' - ] %} + {% if distro_package_manager != 'dnf' %} + {% set freezer_base_packages = [ + 'trickle' + ] %} {{ macros.install_packages(freezer_base_packages | customizable("packages")) }} + {% endif %} ADD freezer-base-archive /freezer-base-source |