From ee0160ee1be71a1b16ef06b8bfbd3a861995e6e4 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Tue, 19 Sep 2017 10:35:30 +0200
Subject: [PATCH] Replace deprecated "include" directive in Ansible 2.4
---
tasks/install.yml | 20 ++++++++++----------
tasks/main.yml | 4 ++--
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tasks/install.yml b/tasks/install.yml
index 5876196..ebb34e2 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
@@ -58,17 +58,17 @@
when: drupal_install_drupal and drupal_available is defined and drupal_available.stdout != [drupalRoot, '/index.php']|join('')
tags: always
-- include: install/{{ installSource.mode|default("none") }}.yml
+- include_tasks: install/{{ installSource.mode|default("none") }}.yml
when: drupal_first_installation
-- include: install/{{ drupal.version|default("d7") }}.yml
+- include_tasks: install/{{ drupal.version|default("d7") }}.yml
when: drupal_first_installation
-- include: deploy/{{ installSource.mode|default("none") }}.yml
+- include_tasks: deploy/{{ installSource.mode|default("none") }}.yml
when: drupal_install_drupal
tags: 'deploy'
-- include: deploy/{{ drupal.version|default("d7") }}.yml
+- include_tasks: deploy/{{ drupal.version|default("d7") }}.yml
when: drupal_install_drupal
tags: 'deploy'
@@ -80,13 +80,13 @@
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
tags: 'deploy'
-- include: users/{{ installSource.mode|default("none") }}.yml
+- include_tasks: users/{{ installSource.mode|default("none") }}.yml
when: drupal_install_drupal and drupal.src is defined and drupal.src.name is defined
tags: 'SetPermissions'
@@ -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']
@@ -152,7 +152,7 @@
with_items: '{{ drupal.domains }}'
when: item.install|default(true)
-- include: deploy/finalize_{{ drupal.version|default("d7") }}.yml
+- include_tasks: deploy/finalize_{{ drupal.version|default("d7") }}.yml
when: drupal_install_drupal
tags: 'deploy'
@@ -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 5acd0ac..676b0c6 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
--
GitLab