4 files changed, 9 insertions, 6 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index 48522109d..dadfa8e9e 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -265,6 +265,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")) }}