Skip to content

Commit 17499e7

Browse files
committed
dnf_repos urls fully overridable again
1 parent d1f3c69 commit 17499e7

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

ansible/roles/dnf_repos/defaults/main.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ dnf_repos_password: "{{ omit }}"
66
dnf_repos_repolist:
77
- file: rocky
88
name: baseos
9-
subpath: "{{ appliances_pulp_repos.baseos[ansible_distribution_version] | appliances_repo_to_subpath }}"
9+
base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.baseos[ansible_distribution_version] | appliances_repo_to_subpath }}"
1010
- file: rocky
1111
name: appstream
12-
subpath: "{{ appliances_pulp_repos.appstream[ansible_distribution_version] | appliances_repo_to_subpath }}"
12+
base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.appstream[ansible_distribution_version] | appliances_repo_to_subpath }}"
1313
- file: rocky
1414
name: crb
15-
subpath: "{{ appliances_pulp_repos.crb[ansible_distribution_version] | appliances_repo_to_subpath }}"
15+
base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.crb[ansible_distribution_version] | appliances_repo_to_subpath }}"
1616
- file: rocky-extras
1717
name: extras
18-
subpath: "{{ appliances_pulp_repos.extras[ansible_distribution_version] | appliances_repo_to_subpath }}"
18+
base_url: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.extras[ansible_distribution_version] | appliances_repo_to_subpath }}"
1919

20-
dnf_repos_epel_subpath: "{{ appliances_pulp_repos.epel[ansible_distribution_major_version] | appliances_repo_to_subpath }}"
20+
dnf_repos_epel_baseurl: "{{ dnf_repos_pulp_content_url }}/{{ appliances_pulp_repos.epel[ansible_distribution_major_version] | appliances_repo_to_subpath }}"
2121
dnf_repos_epel_description: "epel"

ansible/roles/dnf_repos/tasks/set_repos.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
ansible.builtin.yum_repository:
55
file: "{{ item.file }}"
66
name: "{{ item.name }}"
7-
baseurl: "{{ dnf_repos_pulp_content_url }}/{{ item.subpath }}"
7+
baseurl: "{{ item.base_url }}"
88
description: "{{ item.name }}"
99
username: "{{ dnf_repos_username }}"
1010
password: "{{ dnf_repos_password }}"
@@ -21,6 +21,6 @@
2121
file: epel
2222
description: "{{ dnf_repos_epel_description }}"
2323
gpgcheck: false
24-
baseurl: "{{ dnf_repos_pulp_content_url }}/{{ dnf_repos_epel_subpath }}"
24+
baseurl: "{{ dnf_repos_epel_baseurl }}"
2525
username: "{{ dnf_repos_username }}"
2626
password: "{{ dnf_repos_password }}"

0 commit comments

Comments
 (0)