Browse Source

Merge "CentOS 8: Drop trickle install to build freezer"

changes/23/711923/10
Zuul 2 years ago committed by Gerrit Code Review
parent
commit
69f7455467
  1. 8
      docker/freezer/freezer-base/Dockerfile.j2
  2. 1
      kolla/image/build.py
  3. 5
      releasenotes/notes/freezer-drop-trickle-9b3eaaa7d1e4ea5a.yaml

8
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

1
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': {

5
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.
Loading…
Cancel
Save