From df5c5d413af24ca3780e0bbc72aca9f9009b5262 Mon Sep 17 00:00:00 2001 From: Corentin Flr <10946971+cogk@users.noreply.github.com> Date: Fri, 31 May 2024 13:45:12 +0200 Subject: [PATCH] fix(ansible): Use import_tasks instead of include --- bench/playbooks/macosx.yml | 6 +++--- bench/playbooks/roles/mariadb/tasks/main.yml | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/bench/playbooks/macosx.yml b/bench/playbooks/macosx.yml index 12be8f04e..1e6249e2b 100644 --- a/bench/playbooks/macosx.yml +++ b/bench/playbooks/macosx.yml @@ -24,7 +24,7 @@ state: present - name: configure mariadb - include: roles/mariadb/tasks/main.yml + import_tasks: roles/mariadb/tasks/main.yml vars: mysql_conf_tpl: roles/mariadb/files/mariadb_config.cnf @@ -32,10 +32,10 @@ pip: name=mysql-python version=1.2.5 # setup frappe-bench - - include: includes/setup_bench.yml + - import_tasks: includes/setup_bench.yml # setup development environment - - include: includes/setup_dev_env.yml + - import_tasks: includes/setup_dev_env.yml when: not production ... \ No newline at end of file diff --git a/bench/playbooks/roles/mariadb/tasks/main.yml b/bench/playbooks/roles/mariadb/tasks/main.yml index b4e145ad1..9f390353d 100644 --- a/bench/playbooks/roles/mariadb/tasks/main.yml +++ b/bench/playbooks/roles/mariadb/tasks/main.yml @@ -1,11 +1,11 @@ --- -- include: centos.yml +- import_tasks: centos.yml when: ansible_distribution == 'CentOS' and ansible_distribution_major_version|int >= 6 -- include: ubuntu-trusty.yml +- import_tasks: ubuntu-trusty.yml when: ansible_distribution == 'Ubuntu' and ansible_distribution_version == '14.04' -- include: ubuntu-xenial_bionic.yml +- import_tasks: ubuntu-xenial_bionic.yml when: ansible_distribution == 'Ubuntu' and ansible_distribution_major_version|int >= 16 - name: Add configuration