From a89a0dc62429b4752ab0566bc3bc4954613c132a Mon Sep 17 00:00:00 2001
From: Ihar Hrachyshka <ihrachys@redhat.com>
Date: Tue, 29 Jul 2014 11:45:29 +0200
Subject: [PATCH] Revert "cleanup potentially installed older oslo.config"

Icehouse is for long behind our back, so let's remove that hack.

Conflicts:
	lib/oslo

This reverts commit db5fadb5cb768820df54fc3d1c7428a57b511582.

Change-Id: I06d3b0a8779ba51e05c439832ef3b7dbdc97ded1
---
 clean.sh |  1 -
 lib/oslo | 15 ---------------
 2 files changed, 16 deletions(-)

diff --git a/clean.sh b/clean.sh
index e2374e71e6..db1a1e4637 100755
--- a/clean.sh
+++ b/clean.sh
@@ -84,7 +84,6 @@ if [[ -d $TOP_DIR/extras.d ]]; then
 fi
 
 # Clean projects
-cleanup_oslo
 cleanup_cinder
 cleanup_glance
 cleanup_keystone
diff --git a/lib/oslo b/lib/oslo
index a0a1f8f2c4..8d9feb9777 100644
--- a/lib/oslo
+++ b/lib/oslo
@@ -38,10 +38,6 @@ OSLO_BIN_DIR=$(get_python_exec_prefix)
 
 # install_oslo() - Collect source and prepare
 function install_oslo {
-    # TODO(sdague): remove this once we get to Icehouse, this just makes
-    # for a smoother transition of existing users.
-    cleanup_oslo
-
     git_clone $CLIFF_REPO $CLIFF_DIR $CLIFF_BRANCH
     setup_install $CLIFF_DIR
 
@@ -70,17 +66,6 @@ function install_oslo {
     setup_install $TASKFLOW_DIR
 }
 
-# cleanup_oslo() - purge possibly old versions of oslo
-function cleanup_oslo {
-    # this means we've got an old oslo installed, lets get rid of it
-    if ! python -c 'import oslo.config' 2>/dev/null; then
-        echo "Found old oslo.config... removing to ensure consistency"
-        local PIP_CMD=$(get_pip_command)
-        pip_install oslo.config
-        sudo $PIP_CMD uninstall -y oslo.config
-    fi
-}
-
 # Restore xtrace
 $XTRACE