ansible-playbooks/general#72 Go back to includes for main.yml files

tasks/collect_config/main.yml

@@ -20,8 +20,7 @@
 
 - block:
 
-  - include_tasks: 'prepare/{{ collectConfig.mode|default("none") }}.yml'
-    tags: 'always'
+  - include: 'prepare/{{ collectConfig.mode|default("none") }}.yml'
 
   - name: "Move exported config to working copy"
     command: 'mv {{ pathExport }} {{ pathWorking }}'
@@ -37,11 +36,9 @@
       remote_src: yes
     with_items: '{{ list_config_files.stdout_lines }}'
 
-  - include_tasks: 'commit/{{ collectConfig.mode|default("none") }}.yml'
-    tags: 'always'
+  - include: 'commit/{{ collectConfig.mode|default("none") }}.yml'
 
-  - include_tasks: 'finish/{{ collectConfig.mode|default("none") }}.yml'
-    tags: 'always'
+  - include: 'finish/{{ collectConfig.mode|default("none") }}.yml'
 
   - name: "Delete working copy"
     file:

tasks/main.yml

@@ -7,7 +7,7 @@
 
 - block:
   - name: "Install Certs"
-    include_tasks: '../../letsencrypt/tasks/cert.yml'
+    include: '../../letsencrypt/tasks/cert.yml'
     with_subelements:
       - '{{ drupal_settings }}'
       - domains
@@ -20,22 +20,20 @@
 
 - block:
   - name: "Install Drupal"
-    include_tasks: install.yml
+    include: install.yml
     with_items: '{{ drupal_settings }}'
     loop_control:
       loop_var: drupal
     when: limit_site is not defined or drupal.id is not defined or limit_site == drupal.id
-    tags: 'deploy'
 
   when: '"drupal" not in excluded_roles and drupal_install_drupal and (collect_config is not defined or not collect_config)'
 
 - block:
   - name: "Collect Drupal Configuration"
-    include_tasks: collect_config/main.yml
+    include: collect_config/main.yml
     with_items: '{{ drupal_settings }}'
     loop_control:
       loop_var: drupal
     when: limit_site is not defined or drupal.id is not defined or limit_site == drupal.id
-    tags: 'deploy'
 
   when: '"drupal" not in excluded_roles and drupal_install_drupal and collect_config is defined and collect_config'