diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 9722793..ca182bf 100644 --- 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 diff --git a/web.yml b/web.yml index c73ebb6..5f4ab2b 100644 --- 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: