Merge "Workaround for overwriting setuptools on RHEL"
This commit is contained in:
commit
363e15bb94
@ -124,6 +124,14 @@ fi
|
||||
|
||||
if [[ $DISTRO =~ (rhel6) ]]; then
|
||||
|
||||
# install_pip.sh installs the latest setuptools over the packaged
|
||||
# version. We can't really uninstall the packaged version if it
|
||||
# is there, because it may remove other important things like
|
||||
# cloud-init. Things work, but there can be an old egg file left
|
||||
# around from the package that causes some really strange
|
||||
# setuptools errors. Remove it, if it is there
|
||||
sudo rm -f /usr/lib/python2.6/site-packages/setuptools-0.6*.egg-info
|
||||
|
||||
# If the ``dbus`` package was installed by DevStack dependencies the
|
||||
# uuid may not be generated because the service was never started (PR#598200),
|
||||
# causing Nova to stop later on complaining that ``/var/lib/dbus/machine-id``
|
||||
|
Loading…
Reference in New Issue
Block a user