From cac995ed73711838d140a26c2788c1b01d09efc7 Mon Sep 17 00:00:00 2001
From: jurgenhaas <juergen@paragon-es.de>
Date: Wed, 8 Nov 2017 12:02:46 +0100
Subject: [PATCH] ansible-playbooks/general#72 All includes are now
include_tasks and they always have a tag associated
---
tasks/main.yml | 7 ++++---
tasks/php.yml | 6 ++++--
2 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/tasks/main.yml b/tasks/main.yml
index 545dbfa..d471156 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -7,11 +7,12 @@
- name: "PHP Role"
set_fact: role_php_started=true
- tags: always
+ tags: 'always'
- block:
- - import_tasks: php.yml
+ - include_tasks: php.yml
+ tags: 'always'
- name: "Link PhpEnMod for PHP 5.3"
file:
@@ -25,6 +26,6 @@
- name: 'PHP | Remember that this role had been run'
set_fact: role_php_completed=true
- tags: always
+ tags: 'always'
when: '"php" not in excluded_roles and role_php_completed is not defined'
diff --git a/tasks/php.yml b/tasks/php.yml
index 95bbeb2..38ea28c 100644
--- a/tasks/php.yml
+++ b/tasks/php.yml
@@ -49,8 +49,9 @@
notify:
- "Apache | Restart Apache"
-- import_tasks: php53.yml
+- include_tasks: php53.yml
when: php_version|default('5.5') == '5.3'
+ tags: 'always'
- name: "PHP | Configuration file, fcgid.conf"
template:
@@ -106,8 +107,9 @@
owner=www-data
group=www-data
-- import_tasks: oci-{{ php_version|default('5.5') }}.yml
+- include_tasks: oci-{{ php_version|default('5.5') }}.yml
when: repository is defined and php_needs_oci8
+ tags: 'always'
- name: "PHP | Ensure ImageMagick config directory"
file:
--
GitLab