openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Add compose-repos to dlrn config

Browse Source 
This patch adds any existing centos repos generated from yum-config
into dlrn configuration file.

Change-Id: I325fbc375b632b892de4e456234a60ee81070d5d
Signed-off-by: Douglas Viroel <dviroel@redhat.com>
This commit is contained in:
Douglas Viroel
2021-12-01 18:34:18 -03:00
committed by Rafael Castillo
parent bf20bf24f1
commit 9c67668a16
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
roles/build-test-packages/defaults/main.yml
View File

@@ -18,10 +18,10 @@ dlrn_target: >-
{%- elif (ansible_distribution == "CentOS") and
(ansible_distribution_major_version|int >= 8) and
(dlrn_use_local_mirrors|bool) -%}
centos8-local
centos{{ ansible_distribution_major_version }}-local
{%- elif (ansible_distribution == "CentOS") and
(ansible_distribution_major_version|int >= 8) -%}
centos8
centos{{ ansible_distribution_major_version }}
{%- elif (ansible_distribution == "CentOS") and
(ansible_distribution_major_version|int <= 7) and
(dlrn_use_local_mirrors|bool) -%}
@@ -35,7 +35,7 @@ initial_dlrn_config: >-
redhat
{%- elif (ansible_distribution == "CentOS") and
(ansible_distribution_major_version|int >= 8) -%}
centos8
centos{{ ansible_distribution_major_version }}
{%- else -%}
centos
{%- endif -%}
@@ -46,7 +46,7 @@ dlrn_baseurl: >-
{%- if ansible_distribution == "RedHat" and ansible_distribution_major_version|int == 8 -%}
https://trunk.rdoproject.org/rhel8-master
{%- elif (ansible_distribution == "CentOS") and (ansible_distribution_major_version|int >= 8) -%}
https://trunk.rdoproject.org/centos8/
https://trunk.rdoproject.org/centos{{ ansible_distribution_major_version }}/
{%- else -%}
https://trunk.rdoproject.org/centos7/
{%- endif -%}

2
roles/build-test-packages/tasks/main.yml
View File

@@ -146,6 +146,8 @@
cat /etc/yum.repos.d/quickstart-{{ ansible_distribution | lower }}-*.repo >> {{ build_repo_dir }}/DLRN/scripts/{{ initial_dlrn_config }}-local.cfg;
find /etc/yum.repos.d -name "delorean*repo" ! -name "delorean*build-deps.repo" -exec cat {} \; -exec echo "" \;
>> {{ build_repo_dir }}/DLRN/scripts/{{ initial_dlrn_config }}-local.cfg;
find /etc/yum.repos.d -name "CentOS-Stream-*repo" -exec cat {} \; -exec echo "" \;
>> {{ build_repo_dir }}/DLRN/scripts/{{ initial_dlrn_config }}-local.cfg;
find /etc/yum.repos.d -name "delorean*build-deps.repo" -exec sed 's/enabled=.*/enabled=1/g' {} \;
>> {{ build_repo_dir }}/DLRN/scripts/{{ initial_dlrn_config }}-local.cfg;
{% if ansible_distribution in ["RedHat"] and osp_release is defined %}