diff options
| author | Marcin Juszkiewicz <marcin@juszkiewicz.com.pl> | 2021-04-12 14:32:00 +0200 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2021-04-13 11:21:39 +0000 |
| commit | 38fcd184e872bf460a1a65e3342e9806e9b7a05a (patch) | |
| tree | 8ef82255552c04b6ef8952691c6d0e6466117345 /docker/base | |
| parent | 99b82d045b2fe10841773cc73987db0dfcd7e865 (diff) | |
| download | kolla-38fcd184e872bf460a1a65e3342e9806e9b7a05a.tar.gz kolla-38fcd184e872bf460a1a65e3342e9806e9b7a05a.zip | |
centos: enable repos where needed
With RDO use we did not disabled some repositories. This patch disable
them and enable where needed.
Change-Id: Ia9d537fe9c1ad54789d2bfb4027254fbb3defe7e
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 5d5bee4fc..a87c91e08 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -195,8 +195,11 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial # {% set base_centos_yum_repo_packages = [ - 'centos-release-opstools', + 'centos-release-advanced-virtualization', 'centos-release-ceph-nautilus', + 'centos-release-nfv-openvswitch', + 'centos-release-opstools', + 'centos-release-rabbitmq-38', 'epel-release', ] %} @@ -207,8 +210,15 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-centosofficial {% set base_centos_yum_repos_to_enable = [ ] %} +# FIXME(hrw): entries not starting with 'centos-' (and 'centos-nfv-ovs') need +# to go away - they are from delorean or rdo-release-wallaby package +# https://review.rdoproject.org/r/c/rdo-infra/ansible-role-dlrn/+/33241 {% set base_centos_yum_repos_to_disable = [ + 'advanced-virtualization', + 'centos-nfv-ovs', + 'centos-advanced-virtualization', 'centos-ceph-nautilus', + 'centos-nfv-openvswitch', 'centos-opstools', 'centos-rabbitmq-38', ] %} |