Merge pull request #14 from CSCfi/ansible24

Ansible 2.4 cleanups, remove epel-testing
CSCfi · Nov 1, 2017 · 437c942 · 437c942
2 parents 926351e + 4b7e794
commit 437c942
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -13,7 +13,7 @@ matrix:
 env:
   - IMAGE_BUILD_PLATFORM=stable-centos7
   - IMAGE_BUILD_PLATFORM=devel-centos7
-  - IMAGE_BUILD_PLATFORM=epel-centos7
+#  - IMAGE_BUILD_PLATFORM=epel-centos7
 
 install:
   - npm install -g validate-dockerfile

diff --git a/meta/main.yml b/meta/main.yml
@@ -14,7 +14,7 @@ galaxy_info:
   # - Apache
   # - CC-BY
   license: MIT
-  min_ansible_version: 2.0
+  min_ansible_version: 2.4
   #
   # Below are all platforms currently available. Just uncomment
   # the ones that apply to your role. If you don't see your 

diff --git a/tasks/main.yml b/tasks/main.yml
@@ -6,5 +6,5 @@
       that: collectd_set_graphite_prefix is not defined
       msg: "collectd_set_graphite_prefix is deprecated. See defaults/main.yml"
 
-  - include: redhat.yml
+  - include_tasks: redhat.yml
     when: ansible_os_family == "RedHat" and ansible_distribution_major_version == "7"