From d01b4e133987e2d1b61074be03c8ab46c88f9273 Mon Sep 17 00:00:00 2001
From: Albin Vass <albin.vass@gmail.com>
Date: Mon, 25 May 2020 20:43:36 +0200
Subject: [PATCH] configure-mirrors: update include to include_tasks
Change-Id: I77ee216150e497b0b45f34c8778b45d89f63b20e
---
roles/configure-mirrors/tasks/main.yaml | 3 +--
roles/configure-mirrors/tasks/mirror.yaml | 3 +--
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/roles/configure-mirrors/tasks/main.yaml b/roles/configure-mirrors/tasks/main.yaml
index ceec984b4..defc06793 100644
--- a/roles/configure-mirrors/tasks/main.yaml
+++ b/roles/configure-mirrors/tasks/main.yaml
@@ -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
diff --git a/roles/configure-mirrors/tasks/mirror.yaml b/roles/configure-mirrors/tasks/mirror.yaml
index 5b7471ddf..24914792f 100644
--- a/roles/configure-mirrors/tasks/mirror.yaml
+++ b/roles/configure-mirrors/tasks/mirror.yaml
@@ -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"