openstack/kolla
Code Issues Proposed changes

Merge "Revert "CI/Master only: pin opensearch{-dashboards}""

Browse Source
This commit is contained in:
Zuul 2024-04-17 15:39:56 +00:00 committed by Gerrit Code Review
commit 52183ab561
4 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
docker/base/apt_preferences.debian
View File

@ -10,10 +10,3 @@ Pin-Priority: 1000
Package: *
Pin: release n=bookworm-backports
Pin-Priority: -1000
# NOTE (SvenKieske): pin until we have proper authentication
# between haproxy and opensearch-dashboard in CI
# see bug https://bugs.launchpad.net/kolla/+bug/2060668
Package: opensearch*
Pin: version 2.12.*
Pin-Priority: 1000

7
docker/base/apt_preferences.ubuntu
View File

@ -9,10 +9,3 @@ Pin-Priority: 1000
Package: *
Pin: origin dlm.mariadb.com
Pin-Priority: 1000
# NOTE (SvenKieske): pin until we have proper authentication
# between haproxy and opensearch-dashboard in CI
# see bug https://bugs.launchpad.net/kolla/+bug/2060668
Package: opensearch*
Pin: version 2.12.*
Pin-Priority: 1000

6
docker/opensearch/opensearch-dashboards/Dockerfile.j2
View File

@ -10,12 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='opensearch-dashboards', shell='/bin/bash', homedir='/usr/share/opensearch-dashboards') }}
{{ macros.enable_extra_repos(['opensearch-dashboards']) }}
# (SvenKieske): Workaround for https://bugs.launchpad.net/kolla/+bug/2060668
{% if base_package_type == 'rpm' %}
RUN dnf -y install 'dnf-command(versionlock)' && \
dnf versionlock add --raw 'opensearch-dashboards-0:2.12.*'
{% endif %}
{% set opensearch_dashboards_packages = ['opensearch-dashboards'] %}
{{ macros.install_packages(opensearch_dashboards_packages | customizable("packages")) }}

5
docker/opensearch/opensearch/Dockerfile.j2
View File

@ -10,11 +10,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{{ macros.configure_user(name='opensearch', shell='/bin/bash', homedir='/usr/share/opensearch') }}
{{ macros.enable_extra_repos(['opensearch']) }}
# (SvenKieske): Workaround for https://bugs.launchpad.net/kolla/+bug/2060668
{% if base_package_type == 'rpm' %}
RUN dnf -y install 'dnf-command(versionlock)' && \
dnf versionlock add --raw 'opensearch-0:2.12.*'
{% endif %}
{% set opensearch_packages = [
'opensearch'
] %}