From 63c5477f852e3054c0423fa2193a183573e1672a Mon Sep 17 00:00:00 2001 From: Alan Orth Date: Sat, 4 Nov 2017 23:52:53 +0200 Subject: [PATCH] Revert "roles/common: Use static imports for tasks" This reverts commit 5147f4029bcca97dd66ac33a342138906662a89a. I think this was a side effect of using Python 3, not a regression in Ansible 2.4.0.0. --- roles/common/tasks/main.yml | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 692234b..9722793 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -10,23 +10,11 @@ tags: ntp - name: Install common packages - import_tasks: packages_Debian.yml - when: ansible_distribution == 'Debian' - tags: packages - -- name: Install common packages - import_tasks: packages_Ubuntu.yml - when: ansible_distribution == 'Ubuntu' + include_tasks: packages_{{ ansible_distribution }}.yml tags: packages - name: Configure firewall - import_tasks: firewall_Debian.yml - when: ansible_distribution == 'Debian' - tags: firewall - -- name: Configure firewall - import_tasks: firewall_Ubuntu.yml - when: ansible_distribution == 'Ubuntu' + include_tasks: firewall_{{ ansible_distribution }}.yml tags: firewall - name: Configure secure shell daemon