From 371fa51e82db78c2f638088080194f3d1467630c Mon Sep 17 00:00:00 2001
From: Peter Slijkhuis <p.slijkhuis@gmail.com>
Date: Fri, 29 Sep 2017 14:44:29 +0200
Subject: [PATCH] Make installation of EPEL optional (#1721)

---
 roles/kubernetes/preinstall/defaults/main.yml | 1 +
 roles/kubernetes/preinstall/tasks/main.yml    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/roles/kubernetes/preinstall/defaults/main.yml b/roles/kubernetes/preinstall/defaults/main.yml
index 86a1e85ae..75a30a214 100644
--- a/roles/kubernetes/preinstall/defaults/main.yml
+++ b/roles/kubernetes/preinstall/defaults/main.yml
@@ -5,6 +5,7 @@ run_gitinfos: false
 ignore_assert_errors: false
 
 epel_rpm_download_url: "https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm"
+epel_enabled: true
 
 common_required_pkgs:
   - python-httplib2
diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml
index db07794c0..56b52b6c8 100644
--- a/roles/kubernetes/preinstall/tasks/main.yml
+++ b/roles/kubernetes/preinstall/tasks/main.yml
@@ -114,6 +114,7 @@
     - ansible_distribution in ["CentOS","RedHat"]
     - not is_atomic
     - epel_rpm_download_url != ''
+    - epel_enabled|bool
   register: epel_task_result
   until: epel_task_result|succeeded
   retries: 4