From a527249cb8bc5ef5a17fdff3df0dba13e72fd325 Mon Sep 17 00:00:00 2001
From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Date: Sun, 17 May 2020 13:31:07 +0200
Subject: [PATCH] Do not disable RabbitMQ and OpsTools repos.

Kolla disables those repos in https://review.opendev.org/#/c/725032/
patch. This breaks TripleO builds as they assume them to be enabled.

Change-Id: Id6ea8f2a73c5205c3b3626bac42a55a0763feef4
---
 container-images/tripleo_kolla_template_overrides.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2
index 0314e0ea8..7e186ffa4 100644
--- a/container-images/tripleo_kolla_template_overrides.j2
+++ b/container-images/tripleo_kolla_template_overrides.j2
@@ -44,7 +44,7 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo
 ] %}
 {% if base_distro == 'centos' and base_distro_tag.startswith('8') %}
 {%   set base_centos_yum_repos_to_enable_append = ['HighAvailability'] %}
-{%   set base_centos_yum_repos_to_disable_remove = ['influxdb'] %}
+{%   set base_centos_yum_repos_to_disable_remove = ['centos-rabbitmq-38', 'centos-opstools', 'influxdb'] %}
 {% endif %}
 
 {% set base_centos_yum_repo_packages_append = [