opendev/system-config
Code Issues Proposed changes

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

Browse Source 
The redhat-lsb-core package won't apparently be split out until RHEL
6.4 at the earliest:

    https://bugzilla.redhat.com/show_bug.cgi?id=835919

Change-Id: I4bc9bb542e68db26744b834a6de7d99b2249c568
Reviewed-on: https://review.openstack.org/23124
Reviewed-by: Clark Boylan <clark.boylan@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-27 22:19:48 +00:00
committed by Jenkins
parent eda9e75b54
commit 53ec5d4d1a
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
install_jenkins_slave.sh
View File

@@ -23,8 +23,10 @@ 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
yum install -y redhat-lsb-core git puppet
# 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
else #defaults to Ubuntu

6
install_puppet.sh
View File

@@ -27,8 +27,10 @@ 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
yum install -y redhat-lsb-core git puppet-2.7.20-1.el6.noarch
# 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
else
#defaults to Ubuntu
cat > /etc/apt/preferences.d/00-puppet.pref <<EOF