From e340bfb5f94cacaa69a0597fb8a90de67333d25f Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 20 Feb 2016 20:10:41 +0100 Subject: [PATCH] Moving checkings to local.yml. --- local.yml | 2 +- roles/networkpackagemanager/tasks/main.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/local.yml b/local.yml index 1993f64..37525a7 100644 --- a/local.yml +++ b/local.yml @@ -6,7 +6,7 @@ - domainpwd.vault roles: - prereq - - { role: networkpackagemanager, when: 'ansible_local.checksum.needs_pkg_run | bool' } + - { role: networkpackagemanager, when: '(ansible_local.domain.disable_npm is not defined or ansible_local.domain.disable_npm|bool == False) and ansible_local.checksum.needs_pkg_run|bool' } - { role: init, when: 'ansible_local.checksum.needs_repo_run | bool' } - { role: custom, when: 'ansible_local.checksum.needs_repo_run | bool' } - { role: domain, when: 'ansible_local.checksum.needs_repo_run | bool' } diff --git a/roles/networkpackagemanager/tasks/main.yml b/roles/networkpackagemanager/tasks/main.yml index f0f2d88..0501bd1 100644 --- a/roles/networkpackagemanager/tasks/main.yml +++ b/roles/networkpackagemanager/tasks/main.yml @@ -2,4 +2,3 @@ # Doing npm checkings unless disable_npm is set in domain.yml - include: npm.yml - when: ansible_local.domain.disable_npm is not defined or not ansible_local.domain.disable_npm|bool