opendev/system-config
Code Issues Proposed changes

Merge "centos7: don't install EPEL"

Browse Source
This commit is contained in:
Jenkins 2017-04-21 15:31:54 +00:00 committed by Gerrit Code Review
commit 6143f0675f
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
install_puppet.sh
View File

@ -133,26 +133,13 @@ function setup_puppet_fedora {
function setup_puppet_rhel7 { function setup_puppet_rhel7 {
local puppet_pkg="https://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm" local puppet_pkg="https://yum.puppetlabs.com/puppetlabs-release-el-7.noarch.rpm"
# 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
failovermethod=priority
enabled=0
gpgcheck=0
EOF
yum --enablerepo=epel-bootstrap -y install epel-release
rm -f /etc/yum.repos.d/epel-bootstrap.repo
_systemd_update _systemd_update
yum update -y yum update -y
# NOTE: we preinstall lsb_release to ensure facter sets lsbdistcodename # NOTE: we preinstall lsb_release to ensure facter sets lsbdistcodename
yum install -y redhat-lsb-core git yum install -y redhat-lsb-core git
# Install puppetlabs repo & then puppet comes from there
rpm -ivh $puppet_pkg rpm -ivh $puppet_pkg
yum install -y puppet yum install -y puppet
@ -165,7 +152,7 @@ EOF
sed -i '/templatedir/d' /etc/puppet/puppet.conf sed -i '/templatedir/d' /etc/puppet/puppet.conf
# install RDO repo as well; this covers a few things like # install RDO repo as well; this covers a few things like
# openvswitch that aren't available for EPEL # openvswitch that aren't available
yum install -y https://rdoproject.org/repos/rdo-release.rpm yum install -y https://rdoproject.org/repos/rdo-release.rpm
} }