6 files changed, 16 insertions, 7 deletions
diff --git a/docker/base/Dockerfile.j2 b/docker/base/Dockerfile.j2
index a9ab2f58a..84e5cf188 100644
--- a/docker/base/Dockerfile.j2
+++ b/docker/base/Dockerfile.j2
@@ -217,6 +217,8 @@ COPY ceph.repo /etc/yum.repos.d/
 {% set base_centos_yum_repos_to_disable = [
     'centos-ceph-nautilus',
     'centos-nfs-ganesha28',
+    'centos-opstools',
+    'centos-rabbitmq-38',
 ] %}
 
 {% if base_arch == 'x86_64' %}
diff --git a/docker/base/influxdb.repo b/docker/base/influxdb.repo
index 85e4daebf..36011af96 100644
--- a/docker/base/influxdb.repo
+++ b/docker/base/influxdb.repo
@@ -1,6 +1,6 @@
 [influxdb]
 name = InfluxDB Repository - RHEL $releasever
 baseurl = https://repos.influxdata.com/rhel/$releasever/$basearch/stable
-enabled = 1
+enabled = 0
 gpgcheck = 1
 gpgkey = https://repos.influxdata.com/influxdb.key
diff --git a/docker/collectd/Dockerfile.j2 b/docker/collectd/Dockerfile.j2
index a1a958eb0..8553d4613 100644
--- a/docker/collectd/Dockerfile.j2
+++ b/docker/collectd/Dockerfile.j2
@@ -9,6 +9,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='collectd') }}
 
+{{ macros.enable_extra_repos(['opstools']) }}
+
 {% set collectd_packages = [
     'collectd'
 ] %}
diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2
index 9a09d0efb..4f9297077 100644
--- a/docker/openstack-base/Dockerfile.j2
+++ b/docker/openstack-base/Dockerfile.j2
@@ -7,6 +7,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
+{{ macros.enable_extra_repos(['opstools']) }}
+
 {% if install_type == 'binary' %}
     {% if base_package_type == 'rpm' %}
 
diff --git a/docker/telegraf/Dockerfile.j2 b/docker/telegraf/Dockerfile.j2
index 1c2f4ef4d..9e5368c0d 100644
--- a/docker/telegraf/Dockerfile.j2
+++ b/docker/telegraf/Dockerfile.j2
@@ -9,7 +9,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {{ macros.configure_user(name='telegraf', homedir='/etc/telegraf') }}
 
-{{ macros.enable_extra_repos(['influxdb']) }}
+{{ macros.enable_extra_repos(['influxdb', 'opstools']) }}
 
 {% set telegraf_packages = [
     'chrony',
diff --git a/kolla/template/repos.yaml b/kolla/template/repos.yaml
index 2907fc200..567bfcc76 100644
--- a/kolla/template/repos.yaml
+++ b/kolla/template/repos.yaml
@@ -12,7 +12,7 @@ centos:
   influxdb: "influxdb"
   kibana: "elasticsearch-kibana-logstash-6.x"
   nfs-ganesha: "centos-nfs-ganesha28"
-  opstools: "centos-release-opstools"
+  opstools: "centos-opstools"
   rabbitmq: "rabbitmq_rabbitmq-server"
   td-agent: "treasuredata"
 
@@ -26,7 +26,7 @@ centos-aarch64:
   grafana: "grafana"
   hacluster: "HighAvailability"
   nfs-ganesha: "centos-nfs-ganesha28"
-  opstools: "centos-release-opstools"
+  opstools: "centos-opstools"
   rabbitmq: "rabbitmq_rabbitmq-server"
 
 centos-ppc64le:
@@ -37,11 +37,14 @@ centos-ppc64le:
   extras: "extras"
   hacluster: "HighAvailability"
   nfs-ganesha: "centos-nfs-ganesha28"
-  opstools: "centos-release-opstools"
+  opstools: "centos-opstools"
   rabbitmq: "rabbitmq_rabbitmq-server"
 
-# NOTE(hrw): empty dict to avoid TypeError
-rhel: {}
+rhel:
+  erlang: "centos-rabbitmq-38"
+  hacluster: "HighAvailability"
+  opstools: "centos-opstools"
+  rabbitmq: "centos-rabbitmq-38"
 
 debian:
   elasticsearch: "deb [arch=amd64] https://artifacts.elastic.co/packages/oss-6.x/apt stable main"