diff options
| author | Zuul <zuul@review.opendev.org> | 2020-03-01 17:23:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-03-01 17:23:33 +0000 |
| commit | fecd325c67fb7700d86f682be57c1ef456ed7707 (patch) | |
| tree | 5af4a45db86c6d37c5832d68970d8530b4962815 /docker/base | |
| parent | 74d5a66e6bf744ad936d702443a8d64be86441ba (diff) | |
| parent | 1fe8012ce2aec549430212d90ffd728889d6e4aa (diff) | |
| download | kolla-fecd325c67fb7700d86f682be57c1ef456ed7707.tar.gz kolla-fecd325c67fb7700d86f682be57c1ef456ed7707.zip | |
Merge "Actually disable EPEL, and epel-modular"
Diffstat (limited to 'docker/base')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 85237f663..15898af61 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -359,7 +359,7 @@ RUN yum-config-manager --enable rhel-7-server-optional-rpms \ # Install base packages {{ macros.install_packages( base_centos_packages | customizable("centos_packages") | customizable("centos_binary_packages") | customizable("centos_source_packages") ) }} -{{ macros.disable_extra_repos('epel') }} +{{ macros.disable_extra_repos(['epel', 'epel-modular']) }} {# endif for base_package_type rpm #} {% elif base_package_type == 'deb' %} |