diff options
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 8318d9e6b..4f58d806b 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -155,6 +155,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ {% set base_centos_yum_repo_packages = [ 'centos-release-advanced-virtualization', 'centos-release-ceph-nautilus', + 'centos-release-nfv-extras', 'centos-release-nfv-openvswitch', 'centos-release-opstools', 'centos-release-rabbitmq-38', @@ -173,6 +174,7 @@ RUN rm -f /etc/rpm/macros.image-language-conf \ # https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241 {% set base_centos_yum_repos_to_disable = [ 'advanced-virtualization', + 'centos-nfv-extras', 'centos-nfv-ovs', 'centos-advanced-virtualization', 'centos-ceph-nautilus', @@ -311,6 +313,7 @@ COPY apt_preferences /etc/apt/preferences.d/kolla-custom {% set base_apt_keys = [ {'name': 'erlang', 'keyid': 'F77F1EDA57EBB1CC'}, {'name': 'rabbitmq', 'keyid': 'F6609E60DC62814E'}, + {'name': 'haproxy', 'keyid': 'CFFB779AADC995E4F350A060505D97A41C61B9CD'}, ] %} {# NOTE(hrw): type field defaults to 'asc' which is used for single keys #} |