Browse code

Merge "Workaround for overwriting setuptools on RHEL"

Jenkins authored on 2014/08/04 22:57:51
Showing 1 changed files
... ...
@@ -124,6 +124,14 @@ fi
124 124
 
125 125
 if [[ $DISTRO =~ (rhel6) ]]; then
126 126
 
127
+    # install_pip.sh installs the latest setuptools over the packaged
128
+    # version.  We can't really uninstall the packaged version if it
129
+    # is there, because it may remove other important things like
130
+    # cloud-init.  Things work, but there can be an old egg file left
131
+    # around from the package that causes some really strange
132
+    # setuptools errors.  Remove it, if it is there
133
+    sudo rm -f /usr/lib/python2.6/site-packages/setuptools-0.6*.egg-info
134
+
127 135
     # If the ``dbus`` package was installed by DevStack dependencies the
128 136
     # uuid may not be generated because the service was never started (PR#598200),
129 137
     # causing Nova to stop later on complaining that ``/var/lib/dbus/machine-id``