From 578776e0ade53dbf24877d103bd58bbd057d970e Mon Sep 17 00:00:00 2001 From: yatinkarel Date: Fri, 7 Feb 2020 00:34:56 +0530 Subject: [PATCH] Fixes for CentOS8 containers build Following changes are needed for building CentOS8 containers:- - centos-release-opstools repo is not available for CentOS8 yet, until it get's available it need not run in CentOS8. - Highavailability repo need to be enabled for CentOS8 to setup HA packages. - Also add rabbitmq-server-3.7.* ro rabbitmq_packages remove list. - remove influxdb from repo disable as it's not enabled for CentOS8. Change-Id: I4c0c27f54717a2701388c138bbe40ffc0308e5f1 --- container-images/tripleo_kolla_template_overrides.j2 | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2 index 1e44de781..197670ee7 100644 --- a/container-images/tripleo_kolla_template_overrides.j2 +++ b/container-images/tripleo_kolla_template_overrides.j2 @@ -42,9 +42,16 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo 'centos-release-openstack-train', 'epel-release' ] %} +{% 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'] %} +{% endif %} + +{% if base_distro == 'centos' and base_distro_tag.startswith('7') %} {% set base_centos_yum_repo_packages_append = [ 'centos-release-opstools' ] %} +{% endif %} {% set base_centos_binary_packages_remove = ['scsi-target-utils'] %} @@ -357,7 +364,7 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo # workaround for LP #1814233 # Review https://review.opendev.org/#/c/634365/ # Remove when https://review.opendev.org/#/c/634402/ is merged -{% set rabbitmq_packages_remove = ['rabbitmq-server-3.7.10', 'rabbitmq-server-3.8.*'] %} +{% set rabbitmq_packages_remove = ['rabbitmq-server-3.7.10', 'rabbitmq-server-3.7.*', 'rabbitmq-server-3.8.*'] %} {% set rabbitmq_packages_append = [ 'libqb', 'pacemaker',