Migrate to include_tasks, increased min_ansible_version to 2.4

.travis.yml

@@ -6,7 +6,7 @@ env:
   # run against latest version
   - ANSIBLE_VERSION=latest
   # run against minimal required version
-  - ANSIBLE_VERSION=2.0.*
+  - ANSIBLE_VERSION=2.4.*
 
 # Use the new container infrastructure
 sudo: false
@@ -38,4 +38,4 @@ script:
   - ansible-playbook tests/test.yml -i tests/inventory --syntax-check
 
 notifications:
-  webhooks: https://galaxy.ansible.com/api/v1/notifications/
+  webhooks: https://galaxy.ansible.com/api/v1/notifications/

meta/main.yml

@@ -5,7 +5,7 @@ galaxy_info:
   company: pro!vision
   issue_tracker_url: https://wcm-io.atlassian.net
   license: Apache
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
 
   platforms:
   - name: Ubuntu

tasks/aem-author-tests.yml

@@ -1,15 +1,15 @@
 - name: "Run enforce ssl test for author"
   static: no
-  include: ssl-enforce-test.yml
+  include_tasks: ssl-enforce-test.yml
   vars:
     enforce_ssl_config: "{{ conga_config }}"
   when: conga_config.httpd.ssl.enforce
 
 - name: "Check for HTTP code 401 in final http(s) response"
   static: no
-  include: response-test.yml
+  include_tasks: response-test.yml
   vars:
     response_test_config: "{{ conga_config }}"
     response_test_expected_http_code: "{{ conga_aemdst_author_expected_http_code }}"
     response_test_lazy: "{{ conga_aemdst_author_follow_redirects }}"
-    response_test_follow_redirects: "{{ conga_aemdst_author_lazy }}"
+    response_test_follow_redirects: "{{ conga_aemdst_author_lazy }}"

tasks/aem-publish-tests.yml

@@ -1,6 +1,6 @@
 - name: "Run enforce ssl test for tenant"
   static: no
-  include: ssl-enforce-test.yml
+  include_tasks: ssl-enforce-test.yml
   vars:
     enforce_ssl_config: "{{ _tenant.config }}"
   when: _tenant.config.httpd.ssl.enforce
@@ -10,12 +10,12 @@
 
 - name: "Check for HTTP code 200 in final http(s) response"
   static: no
-  include: response-test.yml
+  include_tasks: response-test.yml
   vars:
     response_test_config: "{{ _tenant.config }}"
     response_test_expected_http_code: "{{ conga_aemdst_publish_expected_http_code }}"
     response_test_lazy: "{{ conga_aemdst_publish_follow_redirects }}"
     response_test_follow_redirects: "{{ conga_aemdst_publish_lazy }}"
   with_items: "{{ conga_tenants }}"
   loop_control:
-    loop_var: _tenant
+    loop_var: _tenant

tasks/main.yml

@@ -19,10 +19,10 @@
 
 - name: "Run aem-publish tests"
   static: no
-  include: aem-publish-tests.yml
+  include_tasks: aem-publish-tests.yml
   when: "'aem-publish' in conga_variants"
 
 - name: "Run aem-author tests"
   static: no
-  include: aem-author-tests.yml
-  when: "'aem-author' in conga_variants"
+  include_tasks: aem-author-tests.yml
+  when: "'aem-author' in conga_variants"

tasks/response-test.yml

@@ -16,7 +16,7 @@
       - "response_test_expected_http_code  : {{ response_test_expected_http_code }}"
 
 - name: "Check for {{ aemdst_response_test_expected_http_code }} response when following redirects"
-  include: curl.yml
+  include_tasks: curl.yml
   vars:
     conga_aemdst_curl_url: "{{ _response_test_initial_url }}"
     conga_aemdst_curl_expected_url: "{{ _reponse_test_expected_result_url }}"

tasks/ssl-enforce-test.yml

@@ -1,5 +1,5 @@
 - name: "Run enforce ssl test for {{ enforce_ssl_config.httpd.serverName }}"
-  include: curl.yml
+  include_tasks: curl.yml
   vars:
     conga_aemdst_curl_url: "http://{{ enforce_ssl_config.httpd.serverName }}{{ _initial_port_suffix }}"
     conga_aemdst_curl_expected_url: "https://{{ enforce_ssl_config.httpd.serverNameSsl }}{{ _expected_port_suffix }}/"