opendev
/
system-config
Code Issues Proposed changes

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>
This commit is contained in:
Paul Belanger 2018-07-23 20:18:59 -04:00 committed by Ian Wienand
parent 699ac759c5
commit cecfeb6591
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
install_puppet.sh
View File

@ -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