opendev/system-config
Code Issues Proposed changes

Merge "Always install latest EPEL"

Browse Source
This commit is contained in:
Jenkins 2015-01-16 00:48:48 +00:00 committed by Gerrit Code Review
commit e39c5d0ec3
1 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
install_puppet.sh
View File

@ -83,11 +83,21 @@ function setup_puppet_fedora {
function setup_puppet_rhel7 { function setup_puppet_rhel7 {
local epel_pkg="http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-2.noarch.rpm"
local puppet_pkg="https://yum.puppetlabs.com/el/7/products/x86_64/puppetlabs-release-7-10.noarch.rpm" local puppet_pkg="https://yum.puppetlabs.com/el/7/products/x86_64/puppetlabs-release-7-10.noarch.rpm"
# install EPEL # install a bootstrap epel repo to install latest epel-release
rpm -qi epel-release &> /dev/null || rpm -Uvh $epel_pkg # 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
# 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 puppet yum install -y redhat-lsb-core git puppet
@ -99,14 +109,21 @@ function setup_puppet_rhel7 {
} }
function setup_puppet_rhel6 { function setup_puppet_rhel6 {
local epel_pkg="http://download.fedoraproject.org/pub/epel/6/x86_64/epel-release-6-8.noarch.rpm"
local puppet_pkg="http://yum.puppetlabs.com/el/6/products/x86_64/puppetlabs-release-6-6.noarch.rpm" local puppet_pkg="http://yum.puppetlabs.com/el/6/products/x86_64/puppetlabs-release-6-6.noarch.rpm"
# install EPEL # install a bootstrap epel repo to install latest epel-release
rpm -qi epel-release &> /dev/null || rpm -Uvh $epel_pkg # package (which provides correct gpg keys, etc); then remove
# NOTE: for RHEL (not CentOS) enable the optional-rpms channel (if # boostrap
# not already enabled) cat > /etc/yum.repos.d/epel-bootstrap.repo <<EOF
# yum-config-manager --enable rhel-6-server-optional-rpms [epel-bootstrap]
name=Bootstrap EPEL
mirrorlist=https://mirrors.fedoraproject.org/mirrorlist?repo=epel-6&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
# 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 puppet yum install -y redhat-lsb-core git puppet