From 0f295cbbadd0a2d7ff8cab7974c05e475554a1ab Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 8 Nov 2017 11:11:16 +0100
Subject: [PATCH] ansible-playbooks/general#72 Replace all include with
include_tasks
---
tasks/install.yml | 8 ++++----
tasks/main.yml | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tasks/install.yml b/tasks/install.yml
index 462e9bb..b174f39 100644
--- a/tasks/install.yml
+++ b/tasks/install.yml
@@ -24,7 +24,7 @@
tags: always
- name: "Configure Apache"
- include: apache.yml
+ include_tasks: apache.yml
with_items: '{{ drupal.domains }}'
loop_control:
loop_var: drupal_domain
@@ -80,7 +80,7 @@
with_items: '{{ drupal.links|default([]) }}'
tags: 'deploy'
-- include: scss.yml
+- include_tasks: scss.yml
with_items: '{{ drupal.scss_dir|default([]) }}'
loop_control:
loop_var: scss_dir
@@ -115,7 +115,7 @@
with_items: '{{ drupal.domains }}'
when: item.install|default(true)
-- include: files.yml
+- include_tasks: files.yml
with_nested:
- '{{ drupal.domains }}'
- ['files', 'private']
@@ -201,7 +201,7 @@
tags: 'deploy'
- name: "Install Drupal Databases and Users"
- include: mysql.yml
+ include_tasks: mysql.yml
with_items: '{{ drupal.domains }}'
loop_control:
loop_var: drupal_domain
diff --git a/tasks/main.yml b/tasks/main.yml
index fb1ebea..85f9a60 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,7 +7,7 @@
- block:
- name: "Install Certs"
- include: '../../letsencrypt/tasks/cert.yml'
+ include_tasks: '../../letsencrypt/tasks/cert.yml'
with_subelements:
- '{{ drupal_settings }}'
- domains
@@ -20,7 +20,7 @@
- block:
- name: "Install Drupal"
- include: install.yml
+ include_tasks: install.yml
with_items: '{{ drupal_settings }}'
loop_control:
loop_var: drupal
@@ -30,7 +30,7 @@
- block:
- name: "Collect Drupal Configuration"
- include: collect_config/main.yml
+ include_tasks: collect_config/main.yml
with_items: '{{ drupal_settings }}'
loop_control:
loop_var: drupal
--
GitLab