From b74f1fa69d367ea78069d21fec1795731e4613fd Mon Sep 17 00:00:00 2001 From: "Chandan Kumar (raukadah)" Date: Wed, 29 Apr 2020 14:57:37 +0530 Subject: [PATCH] Enable centos-release-opstools repo for centos-8 Since centos-release-opstools repo is now available for centos-7 and centos-8. So we do not need distro conditional for that. Change-Id: I97e2bcd55f4bff448f9c492d8287ac08832010b2 Signed-off-by: Chandan Kumar (raukadah) --- container-images/tripleo_kolla_template_overrides.j2 | 2 -- 1 file changed, 2 deletions(-) diff --git a/container-images/tripleo_kolla_template_overrides.j2 b/container-images/tripleo_kolla_template_overrides.j2 index 27a0a417b..44d6f5f1a 100644 --- a/container-images/tripleo_kolla_template_overrides.j2 +++ b/container-images/tripleo_kolla_template_overrides.j2 @@ -47,11 +47,9 @@ gpgcheck=0' >> /etc/yum.repos.d/opendaylight.repo {% 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'] %}