From cecfeb6591e4be3f68649fefe300e7d22468c21e Mon Sep 17 00:00:00 2001
From: Paul Belanger <pabelanger@redhat.com>
Date: Mon, 23 Jul 2018 20:18:59 -0400
Subject: [PATCH] Skip epel mirror if already setup

There is no need to configure epel, if already installed when
installing puppet.

Change-Id: Ideba593a78a8017c3855548377193887183818b0
Signed-off-by: Paul Belanger <pabelanger@redhat.com>
---
 install_puppet.sh | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/install_puppet.sh b/install_puppet.sh
index 3f63dd511c..91013bc901 100755
--- a/install_puppet.sh
+++ b/install_puppet.sh
@@ -135,10 +135,14 @@ function setup_puppet_fedora {
 }
 
 function setup_puppet_rhel7 {
-    # install a bootstrap epel repo to install latest epel-release
-    # package (which provides correct gpg keys, etc); then remove
-    # boostrap
-    cat > /etc/yum.repos.d/epel-bootstrap.repo <<EOF
+    # NOTE(pabelanger): In openstack-infra, we already have epel on
+    # our nodes, properly configured for mirrors and gpg keys; thus
+    # check to see if the package is installed first.
+    if ! rpm -qa | grep -q epel-release; then
+        # install a bootstrap epel repo to install latest epel-release
+        # package (which provides correct gpg keys, etc); then remove
+        # boostrap
+        cat > /etc/yum.repos.d/epel-bootstrap.repo <<EOF
 [epel-bootstrap]
 name=Bootstrap EPEL
 mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=epel-7&arch=\$basearch
@@ -146,8 +150,9 @@ failovermethod=priority
 enabled=0
 gpgcheck=0
 EOF
-    yum --enablerepo=epel-bootstrap -y install epel-release
-    rm -f /etc/yum.repos.d/epel-bootstrap.repo
+        yum --enablerepo=epel-bootstrap -y install epel-release
+        rm -f /etc/yum.repos.d/epel-bootstrap.repo
+    fi
 
     _systemd_update
     yum update -y