diff options
| author | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-11-21 17:14:09 +0100 |
|---|---|---|
| committer | Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> | 2019-11-29 11:38:06 +0100 |
| commit | cf11cd6f3d1f0f0d9e1bb948672be12171a4099b (patch) | |
| tree | 389a9c5d535180801bd2547a38fd591d11e12720 /docker/base/Dockerfile.j2 | |
| parent | 9938857d7d331743d71328831241edf21e42d160 (diff) | |
| download | kolla-cf11cd6f3d1f0f0d9e1bb948672be12171a4099b.tar.gz kolla-cf11cd6f3d1f0f0d9e1bb948672be12171a4099b.zip | |
Enable repos only when needed
Disable external repositories by default and enable only when needed.
Depends-on: https://review.opendev.org/696480
Implements: blueprint repos-off-by-default
Change-Id: Icf2a8397a8349e0fe849d88d160409fd234480a9
Diffstat (limited to 'docker/base/Dockerfile.j2')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 42625af7f..590bec89e 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -177,12 +177,29 @@ RUN rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-7 'yum-plugin-priorities' ] %} +{% if distro_package_manager == 'dnf' %} + + # We need 'dnf config-manager' + {% set base_centos_yum_repo_packages = base_centos_yum_repo_packages + [ + 'dnf-plugins-core' + ] %} + +{% endif %} + {% set base_centos_yum_repos_to_disable = [ + 'centos-ceph-nautilus', + 'centos-nfs-ganesha28', + 'centos-qemu-ev', + 'influxdb' ] %} RUN {{ macros.install_packages(base_centos_yum_repo_packages | customizable("centos_yum_repo_packages"), chain=True, clean=False) }} \ {% for repo in base_centos_yum_repos_to_disable | customizable('centos_yum_repos_to_disable') -%} +{%- if distro_package_manager == 'dnf' %} + && dnf config-manager --disable {{ repo }} \ +{% else %} && yum-config-manager --disable {{ repo }} \ +{% endif -%} {% endfor -%} {% for key in base_centos_yum_repo_keys | customizable('centos_yum_repo_keys') -%} && rpm --import {{ key }} \ |
