alanorth/ansible-personal
1
0
Fork 0
Code Issues4 Pull Requests Projects Releases Wiki Activity

Revert "Import OS-specific vars in tasks instead of play"

Browse Source 
This reverts commit e30e4d4b1e3d0221c9bcfaefcbf9524b50c5917b.

I suspect this was a side effect of using Python 3 rather than an
issue in Ansible 2.4.0.0.
This commit is contained in:
Alan Orth 2017-11-04 23:53:38 +02:00
parent 63c5477f85
commit 7b60e6d24f
Signed by: alanorth
GPG Key ID: 0FB860CC9C45B1B9
2 changed files with 1 additions and 5 deletions
roles/common/tasks
main.yml
web.yml

5
roles/common/tasks/main.yml

@ -1,10 +1,5 @@
--- ---
# ported from top-level play because it stopped working around Ansible 2.4.0.0
- name: Import OS-specific variables
include_vars: "vars/{{ ansible_os_family }}.yml"
tags: always
- name: Configure network time - name: Configure network time
import_tasks: ntp.yml import_tasks: ntp.yml
tags: ntp tags: ntp

1
web.yml

@ -13,5 +13,6 @@
- { role: munin, when: ansible_os_family == 'Debian' } - { role: munin, when: ansible_os_family == 'Debian' }
vars_files: vars_files:
- vars/ipsets.yml - vars/ipsets.yml
- "vars/{{ ansible_os_family }}.yml"
# vim: set sw=2 ts=2: # vim: set sw=2 ts=2: