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

tasks/main.yml

@@ -7,9 +7,8 @@
 
 - block:
 
-  - include_tasks: install.yml
-    tags: 'always'
-  - include_tasks: configure.yml
+  - include: install.yml
+  - include: configure.yml
     tags: 'Config'
 
   when: '"haproxy" not in excluded_roles'
@@ -17,20 +16,17 @@
 - block:
 
   - name: "Install Certs"
-    include_tasks: '../../letsencrypt/tasks/cert.yml'
+    include: '../../letsencrypt/tasks/cert.yml'
     with_items: '{{ proxy_certificates|default([]) }}'
     loop_control:
       loop_var: domain
     when: domain.letsencrypt|default(false) and domain.active|default(true)
-    tags: 'always'
 
   - name: "Renew Existing Cert"
-    include_tasks: '../../letsencrypt/tasks/renew.yml'
-    tags: 'always'
+    include: '../../letsencrypt/tasks/renew.yml'
 
   - name: "Build HaCerts"
-    include_tasks: 'buildcerts.yml'
-    tags: 'always'
+    include: 'buildcerts.yml'
 
   - name: "Set directory permissions to current user"
     file:
@@ -46,7 +42,7 @@
 - block:
 
   - name: "Pull Certs from active Proxy"
-    include_tasks: 'pullcerts.yml'
+    include: 'pullcerts.yml'
     tags: 'Certs'
 
   when: 'not proxy_active and "letsencrypt" not in excluded_roles'