opendev
/
system-config
Code Issues Proposed changes

Revert "Use redhat-lsb instead of redhat-lsb-core." 

This reverts commit 53ec5d4d1a.

Turns out redhat-lsb-core was fine after all, as of a week ago:

    https://rhn.redhat.com/errata/RHBA-2013-0448.html

Change-Id: I8c258b084971bb090dc5d09645375939719a3259
Reviewed-on: https://review.openstack.org/23150
Reviewed-by: Khai Do <zaro0508@gmail.com>
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
Jeremy Stanley 2013-02-28 02:58:59 +00:00 committed by Jenkins
parent 53ec5d4d1a
commit 4b8a775efe
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
install_jenkins_slave.sh
View File

@ -23,10 +23,8 @@ if cat /etc/*release | grep "Red Hat" &> /dev/null; then
# NOTE: enable the optional-rpms channel (if not already enabled)
# yum-config-manager --enable rhel-6-server-optional-rpms
# NOTE: we preinstall lsb_release to ensure facter sets lsbdistcodename,
# unfortunately this means redhat-lsb at least until 6.4:
# https://bugzilla.redhat.com/show_bug.cgi?id=835919
yum install -y redhat-lsb git puppet
# NOTE: we preinstall lsb_release to ensure facter sets lsbdistcodename
yum install -y redhat-lsb-core git puppet
else #defaults to Ubuntu

6
install_puppet.sh
View File

@ -27,10 +27,8 @@ if cat /etc/*release | grep "Red Hat" &> /dev/null; then
# NOTE: enable the optional-rpms channel (if not already enabled)
# yum-config-manager --enable rhel-6-server-optional-rpms
# NOTE: we preinstall lsb_release to ensure facter sets lsbdistcodename,
# unfortunately this means redhat-lsb at least until 6.4:
# https://bugzilla.redhat.com/show_bug.cgi?id=835919
yum install -y redhat-lsb git puppet-2.7.20-1.el6.noarch
# NOTE: we preinstall lsb_release to ensure facter sets lsbdistcodename
yum install -y redhat-lsb-core git puppet-2.7.20-1.el6.noarch
else
#defaults to Ubuntu
cat > /etc/apt/preferences.d/00-puppet.pref <<EOF