zuul/zuul-jobs
Code Issues Proposed changes

configure-mirrors: update include to include_tasks

Browse Source 
Change-Id: I77ee216150e497b0b45f34c8778b45d89f63b20e
This commit is contained in:
Albin Vass 2020-05-25 20:43:36 +02:00
parent 162daaebe5
commit d01b4e1339
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 gather_subset: pkg_mgr
- name: Set up infrastructure mirrors - name: Set up infrastructure mirrors
include: mirror.yaml include_tasks: mirror.yaml
when: mirror_fqdn is defined 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 src: etc/pip.conf.j2
- name: Setup distribution specific packaging mirrors - name: Setup distribution specific packaging mirrors
include: "{{ zj_distro_os }}" include_tasks: "{{ zj_distro_os }}"
static: no
with_first_found: with_first_found:
- "mirror/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml" - "mirror/{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yaml"
- "mirror/{{ ansible_distribution }}.yaml" - "mirror/{{ ansible_distribution }}.yaml"