From 4b8a775efef636ab71469da15c60d247d2dbab9b Mon Sep 17 00:00:00 2001 From: Jeremy Stanley Date: Thu, 28 Feb 2013 02:58:59 +0000 Subject: [PATCH] Revert "Use redhat-lsb instead of redhat-lsb-core." This reverts commit 53ec5d4d1aec4094b40e06f7be5f0183a954fe7f. 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 Approved: James E. Blair Reviewed-by: James E. Blair Tested-by: Jenkins --- install_jenkins_slave.sh | 6 ++---- install_puppet.sh | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/install_jenkins_slave.sh b/install_jenkins_slave.sh index 5aa7bf690d..77a9afe4b6 100755 --- a/install_jenkins_slave.sh +++ b/install_jenkins_slave.sh @@ -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 diff --git a/install_puppet.sh b/install_puppet.sh index 33a8fea388..e1cf2f921c 100755 --- a/install_puppet.sh +++ b/install_puppet.sh @@ -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 <