From 548144fc3c2564c9c44a3a42372a1f3b8f2fef34 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 6 Mar 2020 15:07:26 +0000
Subject: [PATCH] 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
---
 docker/freezer/freezer-base/Dockerfile.j2                 | 8 +++++---
 kolla/image/build.py                                      | 1 -
 .../notes/freezer-drop-trickle-9b3eaaa7d1e4ea5a.yaml      | 5 +++++
 3 files changed, 10 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/freezer-drop-trickle-9b3eaaa7d1e4ea5a.yaml

diff --git a/docker/freezer/freezer-base/Dockerfile.j2 b/docker/freezer/freezer-base/Dockerfile.j2
index 5022a7c4a0..299f569853 100644
--- a/docker/freezer/freezer-base/Dockerfile.j2
+++ b/docker/freezer/freezer-base/Dockerfile.j2
@@ -20,10 +20,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 f8ce48ec06..f66a7c076f 100755
--- a/kolla/image/build.py
+++ b/kolla/image/build.py
@@ -154,7 +154,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 0000000000..03852b3455
--- /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.