diff options
| author | Zuul <zuul@review.opendev.org> | 2020-01-21 19:42:13 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-01-21 19:42:13 +0000 |
| commit | 3ddc0b9820767a7ddbc9acc9e39357272fd3aa33 (patch) | |
| tree | 44ec684b058ee6cfef7ccdd260e222e7053b9da3 /docker | |
| parent | 16e0fb9b860d1608f7ac6fdb949251ca73c34730 (diff) | |
| parent | 2c2951b59b6e91c8f0ea6a82c1b3a9b16e1c02f7 (diff) | |
| download | kolla-3ddc0b9820767a7ddbc9acc9e39357272fd3aa33.tar.gz kolla-3ddc0b9820767a7ddbc9acc9e39357272fd3aa33.zip | |
Merge "centos: disable EPEL by default"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/base/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/collectd/Dockerfile.j2 | 4 | ||||
| -rw-r--r-- | docker/macros.j2 | 8 | ||||
| -rw-r--r-- | docker/qdrouterd/Dockerfile.j2 | 2 |
4 files changed, 9 insertions, 6 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2 index 521bf83bc..f1f3b63fe 100644 --- a/docker/base/Dockerfile.j2 +++ b/docker/base/Dockerfile.j2 @@ -269,6 +269,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') }} {# endif for base_package_type rpm #} {% elif base_package_type == 'deb' %} diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2 index a3cc0747b..2f251c5fc 100644 --- a/docker/collectd/Dockerfile.j2 +++ b/docker/collectd/Dockerfile.j2 @@ -88,10 +88,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% endif %} {% endif %} - {% if distro_package_manager == 'yum' %} -# make sure, collectd is pulled from centos-opstools -RUN yum-config-manager --disable epel - {% endif %} {% endif %} {{ macros.install_packages(collectd_packages | customizable("packages")) }} diff --git a/docker/macros.j2 b/docker/macros.j2 index 8c698d278..67e65af8a 100644 --- a/docker/macros.j2 +++ b/docker/macros.j2 @@ -94,6 +94,12 @@ RUN usermod --append --home {{ homedir }} --groups kolla {{ name }} \ {% macro enable_extra_repos(repos) %} -{{ enable_repos(repos) }} +{{ handle_repos(repos, 'enable') }} + +{% endmacro %} + +{% macro disable_extra_repos(repos) %} + +{{ handle_repos(repos, 'disable') }} {% endmacro %} diff --git a/docker/qdrouterd/Dockerfile.j2 b/docker/qdrouterd/Dockerfile.j2 index 049bc5da1..a7885895c 100644 --- a/docker/qdrouterd/Dockerfile.j2 +++ b/docker/qdrouterd/Dockerfile.j2 @@ -20,7 +20,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro in ['centos'] %} # make sure qpid is pulled from centos-openstack-RELEASE (RDO) repo -RUN {% if distro_package_manager == 'dnf' %}dnf config-manager{% else %}yum-config-manager{% endif %} --disable epel centos-release-opstools extras +{{ macros.disable_extra_repos(['extras', 'opstools']) }} {% endif %} {{ macros.install_packages(qdrouterd_packages | customizable("packages")) }} |