Skip to content

Commit

Permalink
fix(ansible): Use import_tasks instead of include
Browse files Browse the repository at this point in the history
  • Loading branch information
cogk committed May 31, 2024
1 parent 07b1462 commit df5c5d4
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 3 additions & 3 deletions bench/playbooks/macosx.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,18 +24,18 @@
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

- name: Install MySQLdb in global env
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

...
6 changes: 3 additions & 3 deletions bench/playbooks/roles/mariadb/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -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
Expand Down

0 comments on commit df5c5d4

Please sign in to comment.