summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Goddard <mark@stackhpc.com>2020-03-06 15:07:26 +0000
committerMark Goddard <mark@stackhpc.com>2020-03-25 13:39:09 +0000
commit9d5a8fcd73e2b177609be64840757848f57a39cd (patch)
tree862eddac0771ec8f77933bed71c34eccd2ab8b35
parent052a9433659347a35d4f81b6a07bb83d97a17ad2 (diff)
downloadkolla-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)
-rw-r--r--docker/freezer/freezer-base/Dockerfile.j28
-rwxr-xr-xkolla/image/build.py1
-rw-r--r--releasenotes/notes/freezer-drop-trickle-9b3eaaa7d1e4ea5a.yaml5
3 files changed, 10 insertions, 4 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
diff --git a/kolla/image/build.py b/kolla/image/build.py
index 126e24ace..2bd6dfe4c 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -167,7 +167,6 @@ UNBUILDABLE_IMAGES = {
'centos8+source': {
"cyborg-agent", # opae-sdk does not support CentOS 8
- "freezer-base", # Missing package trickle
},
'debian': {
diff --git a/releasenotes/notes/freezer-drop-trickle-9b3eaaa7d1e4ea5a.yaml b/releasenotes/notes/freezer-drop-trickle-9b3eaaa7d1e4ea5a.yaml
new file mode 100644
index 000000000..03852b345
--- /dev/null
+++ b/releasenotes/notes/freezer-drop-trickle-9b3eaaa7d1e4ea5a.yaml
@@ -0,0 +1,5 @@
+---
+upgrade:
+ - |
+ The ``trickle`` package is no longer available for CentOS 8, and has been
+ removed from the CentOS 8 Freezer images.