From e4c9c9680be9454f98da8285d016cdbe2c1be221 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Tue, 11 Mar 2014 17:07:57 -0700 Subject: [PATCH] Remove unneeded package sources from nodepool node We need additional package sources on nodepool nodes to install things like puppet, pypy, and python3. But once these packages are installed we don't need them anymore. Any test that does an apt-get update or yum upgrade will hit these package repos despite not needing to. Remove the additional sources after we are done with them to be nicer to them. Fixes-Bug: 1253774 Change-Id: I3c5bd7e544076f26b224553bdea6134d39fc8bba --- .../files/nodepool/scripts/prepare_node.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/modules/openstack_project/files/nodepool/scripts/prepare_node.sh b/modules/openstack_project/files/nodepool/scripts/prepare_node.sh index fb45e0f9a6..e274ab2ba1 100755 --- a/modules/openstack_project/files/nodepool/scripts/prepare_node.sh +++ b/modules/openstack_project/files/nodepool/scripts/prepare_node.sh @@ -44,5 +44,21 @@ sudo -i python /opt/nodepool-scripts/cache_git_repos.py # boot (eg when this image is used for testing). sudo sed -i 's/ext3/ext4/g' /etc/fstab +# Remove additional sources used to install puppet or special version of pypi. +# We do this because leaving these sources in place causes every test that +# does an apt-get update to hit those servers which may not have the uptime +# of our local mirrors. +OS_FAMILY=$(facter osfamily) +if [ "$OS_FAMILY" == "Debian" ] ; then + sudo rm -f /etc/apt/sources.list.d/* + sudo apt-get update +elif [ "$OS_FAMILY" == "RedHat" ] ; then + # Can't delete * in yum.repos.d since all of the repos are listed there. + # Be specific instead. + if [ -f /etc/yum.repos.d/puppetlabs.repo ] ; then + sudo rm -f /etc/yum.repos.d/puppetlabs.repo + fi +fi + sync sleep 5