opendev/system-config
Code Issues Proposed changes

Preinstall lsb_release on RHEL.

Browse Source 
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 <fungi@yuggoth.org>
Approved: Clark Boylan <clark.boylan@gmail.com>
Reviewed-by: Clark Boylan <clark.boylan@gmail.com>
Tested-by: Jenkins
This commit is contained in:
Dan Prince 2013-02-27 15:07:38 -05:00 committed by Jenkins
parent 2a225b730c
commit c778aaa2f7
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
install_jenkins_slave.sh
View File

@ -22,7 +22,9 @@ if cat /etc/*release | grep "Red Hat" &> /dev/null; then
yum update -y yum update -y
# NOTE: enable the optional-rpms channel (if not already enabled) # NOTE: enable the optional-rpms channel (if not already enabled)
# yum-config-manager --enable rhel-6-server-optional-rpms # 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 else #defaults to Ubuntu

4
install_puppet.sh
View File

@ -26,7 +26,9 @@ if cat /etc/*release | grep "Red Hat" &> /dev/null; then
yum update -y yum update -y
# NOTE: enable the optional-rpms channel (if not already enabled) # NOTE: enable the optional-rpms channel (if not already enabled)
# yum-config-manager --enable rhel-6-server-optional-rpms # 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 else
#defaults to Ubuntu #defaults to Ubuntu
cat > /etc/apt/preferences.d/00-puppet.pref <<EOF cat > /etc/apt/preferences.d/00-puppet.pref <<EOF