From e1f0baaf0b3b75e6c7645d5be3c1bdc22805202c Mon Sep 17 00:00:00 2001 From: Amol Kahat Date: Fri, 30 Dec 2022 18:51:31 +0530 Subject: [PATCH] Skip centos.repo setup for C8 Centos.repo[1] already set for c9 in oooci-build-images vars, in this patch we are doing same. [1] https://opendev.org/openstack/tripleo-ci/src/branch/master/roles/oooci-build-images/vars/centos-9.yaml#L6 Signed-off-by: Amol Kahat Change-Id: I7fd57cf395a98094c1033083bc8c075b040d49a6 --- roles/build-images/defaults/main.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/roles/build-images/defaults/main.yml b/roles/build-images/defaults/main.yml index 3bae7564a..b24a54bd7 100644 --- a/roles/build-images/defaults/main.yml +++ b/roles/build-images/defaults/main.yml @@ -14,5 +14,5 @@ overcloud_as_undercloud: true overcloud_repo_paths: - "/etc/yum.repos.d/delorean*" - "/etc/yum.repos.d/quickstart-*" - - "/etc/yum.repos.d/centos.repo" + - "{% if ansible_distribution_major_version is version('9', '>=') -%}/etc/yum.repos.d/centos.repo{% endif %}" - "{% if job is defined and job.component is defined -%}/etc/yum.repos.d/*-component.repo{%- endif -%}"