Merge branch 'release/1.1.1'

chusiang · Mar 25, 2016 · bb05e18 · bb05e18
2 parents 5e8ffc2 + b50d956
commit bb05e18
Showing 1 changed file with 12 additions and 2 deletions.
diff --git a/tasks/use-yum.yml b/tasks/use-yum.yml
@@ -15,11 +15,21 @@
 
 ---
 
-- name: Install epel from remote repo
+- name: Install epel from remote repo on CentOS 7
   yum: name=https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm state=present
+  when: ansible_distribution_version >= "7"
 
-- name: Install remi from remote repo
+- name: Install epel from remote repo on CentOS 6
+  yum: name=https://dl.fedoraproject.org/pub/epel/epel-release-latest-6.noarch.rpm state=present
+  when: ansible_distribution_version = "6.7"
+
+- name: Install remi from remote repo on CentOS 7
   yum: name=http://rpms.remirepo.net/enterprise/remi-release-7.rpm state=present
+  when: ansible_distribution_version >= "7"
+
+- name: Install remi from remote repo on CentOS 6
+  yum: name=http://rpms.remirepo.net/enterprise/remi-release-6.rpm state=present
+  when: ansible_distribution_version = "6.7"
 
 - name: get ius repo install script
   get_url: url=https://setup.ius.io/ dest=/tmp/setup-ius.sh