zuul
/
zuul-jobs
Code Issues Proposed changes

Merge "configure-mirrors: update include to include_tasks"

This commit is contained in:
Zuul 2020-05-26 15:57:56 +00:00 committed by Gerrit Code Review
parent 0f42740b4a d01b4e1339
commit 0a02594e6f
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
roles/configure-mirrors/tasks/main.yaml
View File

@ -4,6 +4,5 @@
gather_subset: pkg_mgr
- name: Set up infrastructure mirrors
include: mirror.yaml
include_tasks: mirror.yaml
when: mirror_fqdn is defined
static: no

3
roles/configure-mirrors/tasks/mirror.yaml
View File

@ -24,8 +24,7 @@
src: etc/pip.conf.j2
- name: Setup distribution specific packaging mirrors
include: "{{ zj_distro_os }}"
static: no
include_tasks: "{{ zj_distro_os }}"
with_first_found:
- "mirror/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
- "mirror/{{ ansible_distribution }}.yaml"