From 8cb3b263217a32754f687903ad16b279095eedf4 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Thu, 9 Nov 2017 15:02:47 +0100
Subject: [PATCH] ansible-playbooks/general#72 Go back to includes for main.yml
files
---
tasks/main.yml | 27 +++++++++------------------
1 file changed, 9 insertions(+), 18 deletions(-)
diff --git a/tasks/main.yml b/tasks/main.yml
index e85c391..f152ff8 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,36 +7,27 @@
- block:
- - include_tasks: prepare.yml
- tags: 'always'
+ - include: prepare.yml
- - include_tasks: install.yml
- tags: 'always'
+ - include: install.yml
- - include_tasks: configure.yml
- tags: 'always'
+ - include: configure.yml
- - include_tasks: apache.yml
+ - include: apache.yml
when: groups['webserver'] is defined and inventory_hostname in groups['webserver']
- tags: 'always'
- - include_tasks: elasticsearch.yml
+ - include: elasticsearch.yml
when: groups['logserver'] is defined and inventory_hostname in groups['logserver']
- tags: 'always'
- - include_tasks: haproxy.yml
+ - include: haproxy.yml
when: groups['proxyserver'] is defined and inventory_hostname in groups['proxyserver']
- tags: 'always'
- - include_tasks: mysql.yml
+ - include: mysql.yml
when: groups['dbserver-mysql'] is defined and inventory_hostname in groups['dbserver-mysql']
- tags: 'always'
- - include_tasks: silent.yml
- tags: 'always'
+ - include: silent.yml
- - include_tasks: varnish.yml
+ - include: varnish.yml
when: groups['varnishserver'] is defined and inventory_hostname in groups['varnishserver']
- tags: 'always'
when: '"netdata" not in excluded_roles'
--
GitLab