diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-25 12:30:58 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-25 12:30:58 +0000 |
| commit | 69f74554671a49c75bebeeed9d83816ffbd7efec (patch) | |
| tree | f1e50471e062e59eefe21c3fc0a53218750255ff | |
| parent | 4716a2802b57cd91d8ff7fd01288e1f6d2ba070e (diff) | |
| parent | 548144fc3c2564c9c44a3a42372a1f3b8f2fef34 (diff) | |
| download | kolla-69f74554671a49c75bebeeed9d83816ffbd7efec.tar.gz kolla-69f74554671a49c75bebeeed9d83816ffbd7efec.zip | |
Merge "CentOS 8: Drop trickle install to build freezer"
| -rw-r--r-- | docker/freezer/freezer-base/Dockerfile.j2 | 8 | ||||
| -rwxr-xr-x | kolla/image/build.py | 1 | ||||
| -rw-r--r-- | releasenotes/notes/freezer-drop-trickle-9b3eaaa7d1e4ea5a.yaml | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/docker/freezer/freezer-base/Dockerfile.j2 b/docker/freezer/freezer-base/Dockerfile.j2 index 5022a7c4a..299f56985 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 f8ce48ec0..f66a7c076 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 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. |