ansible-playbooks/general#72 Always use import_tasks or include_tasks instead of just include

tasks/jailkit.yml

@@ -28,9 +28,8 @@
   failed_when: false
   changed_when: false
 
-- include_tasks: install.yml
+- import_tasks: install.yml
   when: jailkit_available is defined and jailkit_available.stdout != '/usr/sbin/jk_init'
-  tags: 'always'
 
 - name: "Create Jail Root Directory"
   file:
@@ -72,12 +71,11 @@
   when: item.jail is defined and (limit_site is not defined or item.id is not defined or limit_site == item.id)
 
 - name: "Init Jails"
-  include: initjail.yml
+  include_tasks: initjail.yml
   with_items: '{{ drupal_settings|default([]) }}'
   loop_control:
     loop_var: drupal
   when: drupal.jail is defined and (jail_available|changed or jailsite_init_force) and (limit_site is not defined or drupal.id is not defined or limit_site == drupal.id)
-  tags: 'always'
 
 - name: "Ensure tmp Directory"
   file:
@@ -176,7 +174,6 @@
   loop_control:
     loop_var: username
   when: username != tunnel_user_name and jailuser_init
-  tags: 'always'
 
 - name: "Update config files"
   template:

tasks/main.yml

@@ -7,6 +7,6 @@
 
 - block:
 
-  - include: jailkit.yml
+  - import_tasks: jailkit.yml
 
   when: '"jailkit" not in excluded_roles and jailkit'

tasks/updatejail.yml

 ---
 # file: roles/jailkit/tasks/updatejail.yml
 
-- name: "JailKit Update Components"
-  shell: jk_init -j {{ jailroot }}/{{ drupal.jail.name }} {{ jailkit_components }}
+- block:
 
-- name: "JailKit Update Directories"
-  shell: jk_update -j {{ jailroot }}/{{ drupal.jail.name }} --skip=/etc/drush/aliases.drushrc.php /bin /dev /etc /home /lib /lib64 /opt /usr
+  - name: "JailKit Update Components"
+    shell: jk_init -j {{ jailroot }}/{{ drupal.jail.name }} {{ jailkit_components }}
 
-- name: "Reset Permissions in User Homes"
-  file:
-    path: '{{ jailroot }}/{{ drupal.jail.name }}/home/{{ item }}'
-    state: 'directory'
-    owner: '{{ item }}'
-    group: 'root'
-    recurse: yes
-  with_flattened:
-    - '{{ admins }}'
-    - '{{ jailusers }}'
+  - name: "JailKit Update Directories"
+    shell: jk_update -j {{ jailroot }}/{{ drupal.jail.name }} --skip=/etc/drush/aliases.drushrc.php /bin /dev /etc /home /lib /lib64 /opt /usr
 
-- name: "Set shell for crontabs"
-  cron:
-    name: 'SHELL'
-    env: yes
-    value: '/usr/sbin/jk_chrootsh'
-    user: '{{ drupal.jail.name }}'
+  - name: "Reset Permissions in User Homes"
+    file:
+      path: '{{ jailroot }}/{{ drupal.jail.name }}/home/{{ item }}'
+      state: 'directory'
+      owner: '{{ item }}'
+      group: 'root'
+      recurse: yes
+    with_flattened:
+      - '{{ admins }}'
+      - '{{ jailusers }}'
+
+  - name: "Set shell for crontabs"
+    cron:
+      name: 'SHELL'
+      env: yes
+      value: '/usr/sbin/jk_chrootsh'
+      user: '{{ drupal.jail.name }}'
+
+  tags:
+    - 'UpdateJails'
+    - 'shells'