From 1dfd937cbab42aaa1bad03bc158781fc0252e53a Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Date: Sat, 2 May 2020 18:41:27 +0200
Subject: CentOS: disable more repos

'messaging-rabbitmq' and 'opstools' are enabled by RDO
delorean-deps.repo file

'influxdb' was also enabled

Depends-On: https://review.opendev.org/728687

Change-Id: Ibb0a7edc9e5632c1b89a7d52601f55a223b49dfb
---
 docker/base/Dockerfile.j2           | 2 ++
 docker/base/influxdb.repo           | 2 +-
 docker/collectd/Dockerfile.j2       | 2 ++
 docker/openstack-base/Dockerfile.j2 | 2 ++
 docker/telegraf/Dockerfile.j2       | 2 +-
 5 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'docker')

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',
-- 
cgit v1.2.3