diff options
| author | Zuul <zuul@review.opendev.org> | 2019-12-04 17:45:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-12-04 17:45:50 +0000 |
| commit | fb74313d7df98aabaa2fd3f8fb606110aa042d27 (patch) | |
| tree | 50a9075da44a9c01788a02b686a357cba00e569e /docker/base/Dockerfile.j2 | |
| parent | 59c881d85c4c9154a459c8c695f10243b387f047 (diff) | |
| parent | cf11cd6f3d1f0f0d9e1bb948672be12171a4099b (diff) | |
| download | kolla-fb74313d7df98aabaa2fd3f8fb606110aa042d27.tar.gz kolla-fb74313d7df98aabaa2fd3f8fb606110aa042d27.zip | |
Merge "Enable repos only when needed"
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 }} \ |