From 1d7b3cb477246159f1ae4bb5ecbfde6082f4d80b Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Sun, 25 Mar 2018 15:55:51 +0200
Subject: [PATCH] ansible-playbooks/general#72 Always use import_tasks or
include_tasks instead of just include
---
tasks/main.yml | 2 +-
tasks/spideroak.yml | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/tasks/main.yml b/tasks/main.yml
index 805c03a..85d5ea3 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,6 +7,6 @@
- block:
- - include: spideroak.yml
+ - import_tasks: spideroak.yml
when: '"spideroak" not in excluded_roles and spideroak_username is defined and spideroak_username != ""'
diff --git a/tasks/spideroak.yml b/tasks/spideroak.yml
index 1ee1599..80a6fb3 100644
--- a/tasks/spideroak.yml
+++ b/tasks/spideroak.yml
@@ -24,9 +24,8 @@
state='installed'
update_cache=yes
-- include_tasks: register.yml
+- import_tasks: register.yml
when: spideroak_available is defined and spideroak_available.stdout != '/usr/bin/SpiderOakONE'
- tags: 'always'
- name: "Stop SpiderOak"
service:
--
GitLab