From 7b60e6d24f926c742be664eee9029e662eff164b Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Sat, 4 Nov 2017 23:53:38 +0200 Subject: [PATCH] Revert "Import OS-specific vars in tasks instead of play" 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. --- roles/common/tasks/main.yml | 5 ----- web.yml | 1 + 2 files changed, 1 insertion(+), 5 deletions(-) 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: