From 53ecb4ff8f97f763599294abd1d30d2940850dfb Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Thu, 17 Jul 2014 16:32:37 +0200 Subject: [PATCH] Remove setuptools from CentOS with prejudice Installing setuptools with pip overtop of system setuptools has evil and destructive results. Kill it with a hammer before re-installing. Change-Id: I556b2cec249ef46e09ffca3cd75521e0beeb7779 --- install_puppet.sh | 5 ++++ modules/openstack_project/files/yum.conf | 27 +++++++++++++++++++++ modules/openstack_project/manifests/base.pp | 8 ++++++ 3 files changed, 40 insertions(+) create mode 100644 modules/openstack_project/files/yum.conf diff --git a/install_puppet.sh b/install_puppet.sh index 95476b924d..9689503c73 100755 --- a/install_puppet.sh +++ b/install_puppet.sh @@ -172,6 +172,11 @@ function setup_pip { exit 1 fi + if is_rhel6; then + yum erase -y python-setuptools + rm -rf /usr/lib/python2.6/site-packages/setuptools* + fi + python get-pip.py pip install -U setuptools } diff --git a/modules/openstack_project/files/yum.conf b/modules/openstack_project/files/yum.conf new file mode 100644 index 0000000000..822efdd65c --- /dev/null +++ b/modules/openstack_project/files/yum.conf @@ -0,0 +1,27 @@ +[main] +cachedir=/var/cache/yum/$basearch/$releasever +keepcache=0 +debuglevel=2 +logfile=/var/log/yum.log +exactarch=1 +obsoletes=1 +gpgcheck=1 +plugins=1 +installonly_limit=5 +bugtracker_url=http://bugs.centos.org/set_project.php?project_id=16&ref=http://bugs.centos.org/bug_report_page.php?category=yum +distroverpkg=centos-release +exclude=python-setuptools + +# This is the default, if you make this bigger yum won't see if the metadata +# is newer on the remote and so you'll "gain" the bandwidth of not having to +# download the new metadata and "pay" for it by yum not having correct +# information. +# It is esp. important, to have correct metadata, for distributions like +# Fedora which don't keep old packages around. If you don't like this checking +# interupting your command line usage, it's much better to have something +# manually check the metadata once an hour (yum-updatesd will do this). +# metadata_expire=90m + +# PUT YOUR REPOS HERE OR IN separate files named file.repo +# in /etc/yum.repos.d + diff --git a/modules/openstack_project/manifests/base.pp b/modules/openstack_project/manifests/base.pp index e61d40d9a5..159470b8b0 100644 --- a/modules/openstack_project/manifests/base.pp +++ b/modules/openstack_project/manifests/base.pp @@ -148,6 +148,14 @@ class openstack_project::base( source => 'puppet:///modules/openstack_project/centos-puppetlabs.repo', replace => true, } + file { '/etc/yum.conf': + ensure => present, + owner => 'root', + group => 'root', + mode => '0444', + source => 'puppet:///modules/openstack_project/yum.conf', + replace => true, + } } file { '/etc/puppet/puppet.conf':