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

This reverts commit e30e4d4b1e. I suspect this was a side effect of using Python 3 rather than an issue in Ansible 2.4.0.0.
2017-11-04 23:53:38 +02:00 · 2017-11-04 23:53:38 +02:00 · 7b60e6d24f
parent 63c5477f85
commit 7b60e6d24f
2 changed files with 1 additions and 5 deletions
--- a/roles/common/tasks/main.yml
+++ b/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
  import_tasks: ntp.yml
  tags: ntp
--- a/web.yml
+++ b/web.yml
@ -13,5 +13,6 @@
    - { role: munin, when: ansible_os_family == 'Debian' }
  vars_files:
    - vars/ipsets.yml
+    - "vars/{{ ansible_os_family }}.yml"

 # vim: set sw=2 ts=2: