From f12ad6a56fe1c94c0b03d03960f7502282c77939 Mon Sep 17 00:00:00 2001
From: Rob Hirschfeld <rob@rackn.com>
Date: Tue, 12 Apr 2016 18:41:46 -0700
Subject: [PATCH] consolidate EPEL change into a single task
as per @smana request
---
roles/kubernetes/preinstall/tasks/main.yml | 11 ++---------
1 file changed, 2 insertions(+), 9 deletions(-)
diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml
index 08f45d88e..33fc38b0d 100644
--- a/roles/kubernetes/preinstall/tasks/main.yml
+++ b/roles/kubernetes/preinstall/tasks/main.yml
@@ -78,17 +78,10 @@
ansible_distribution_major_version > 21
changed_when: False
-- name: Check if epel-release-7-5.noarch is installed
- command: rpm -q epel-release-7-5.noarch
- register: epel_check
- when: ansible_distribution in ["CentOS","RedHat"] and
- ansible_distribution_major_version >= 7
-
- name: Install epel-release on RedHat/CentOS
- command: rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+ shell: rpm -qa | grep epel-release || rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
when: ansible_distribution in ["CentOS","RedHat"] and
- ansible_distribution_major_version >= 7 and
- epel_check.stdout.find('is not installed') != -1
+ ansible_distribution_major_version >= 7
changed_when: False
- name: Install packages requirements
--
GitLab