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