From c778aaa2f707f94636ca1facd3389960b2e169d0 Mon Sep 17 00:00:00 2001 From: Dan Prince Date: Wed, 27 Feb 2013 15:07:38 -0500 Subject: [PATCH] Preinstall lsb_release on RHEL. Updates the puppet install scripts so that we pre-install lsb_release on RHEL distros. We *think* this fixes an issue where lsbdistcodename wasn't getting set correctly and was causing subsequent puppet failures like this: lsbdistcodename fact not available: release parameter required at /etc/puppet/modules/apt/manifests/ppa.pp Change-Id: I1758ee8be9a599e17f1ccb98fc95b2b4f29916f7 Reviewed-on: https://review.openstack.org/23111 Reviewed-by: Jeremy Stanley Approved: Clark Boylan Reviewed-by: Clark Boylan Tested-by: Jenkins --- install_jenkins_slave.sh | 4 +++- install_puppet.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/install_jenkins_slave.sh b/install_jenkins_slave.sh index a12aa352b9..77a9afe4b6 100755 --- a/install_jenkins_slave.sh +++ b/install_jenkins_slave.sh @@ -22,7 +22,9 @@ if cat /etc/*release | grep "Red Hat" &> /dev/null; then yum update -y # NOTE: enable the optional-rpms channel (if not already enabled) # yum-config-manager --enable rhel-6-server-optional-rpms - yum install -y 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 d890795ee9..e1cf2f921c 100755 --- a/install_puppet.sh +++ b/install_puppet.sh @@ -26,7 +26,9 @@ if cat /etc/*release | grep "Red Hat" &> /dev/null; then yum update -y # NOTE: enable the optional-rpms channel (if not already enabled) # yum-config-manager --enable rhel-6-server-optional-rpms - yum install -y 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 <