From 6a41ba20e7978c5f62a125412a9489d59e520a43 Mon Sep 17 00:00:00 2001 From: Ian Wienand Date: Mon, 17 Nov 2014 10:46:56 +1100 Subject: [PATCH] Remove rackspace/centos7 work-around The current centos 7 images from rackspace do not have cloud-init installed via pip, so this is no longer needed. This work around is actually a little wrong too, see the bug. Change-Id: I6642593ca2248d9e01f653cc8e70c70ba8372e50 Partial-bug: #1393073 --- stack.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/stack.sh b/stack.sh index 7635f32298..ef4591e232 100755 --- a/stack.sh +++ b/stack.sh @@ -209,14 +209,6 @@ if is_ubuntu; then echo 'APT::Acquire::Retries "20";' | sudo tee /etc/apt/apt.conf.d/80retry >/dev/null fi -# upstream Rackspace centos7 images have an issue where cloud-init is -# installed via pip because there were not official packages when the -# image was created (fix in the works). Remove all pip packages -# before we do anything else -if [[ $DISTRO = "rhel7" && is_rackspace ]]; then - (sudo pip freeze | xargs sudo pip uninstall -y) || true -fi - # Some distros need to add repos beyond the defaults provided by the vendor # to pick up required packages.