@@ -15,7 +15,7 @@ source $TOP_DIR/stackrc

 # comma separated list of script basenames to skip

 # to refrain from exercising euca.sh use SKIP_EXERCISES=euca

-SKIP_EXERCISES=${SKIP_EXERCISES:-""}

+SKIP_EXERCISES=${SKIP_EXERCISES:-"boot_from_volume,bundle,euca"}

 # comma separated list of script basenames to run

 # to run only euca.sh use RUN_EXERCISES=euca

@@ -1,7 +1,7 @@

 bridge-utils

 pep8

 pylint

-python-pip

+python-setuptools

 screen

 unzip

 wget

@@ -21,4 +21,3 @@ tcpdump

 euca2ools # only for testing client

 tar

 python-cmd2 # dist:precise

-python-netaddr

@@ -22,4 +22,3 @@ python-cherrypy3 # why?

 python-migrate

 nodejs

 nodejs-legacy # dist:quantal

-python-netaddr

@@ -1,4 +1,3 @@

-python-setuptools

 python-dev

 python-lxml

 python-pastescript

@@ -30,7 +30,6 @@ python-greenlet

 python-libvirt

 python-libxml2

 python-routes

-python-netaddr

 python-numpy # used by websockify for spice console

 python-pastedeploy

 python-eventlet

@@ -41,7 +40,6 @@ python-sqlalchemy

 python-suds

 python-lockfile

 python-m2crypto

-python-boto

 python-kombu

 python-feedparser

 python-iso8601

@@ -4,12 +4,10 @@ iputils-ping

 iputils-arping

 mysql-server #NOPRIME

 sudo

-python-boto

 python-iso8601

 python-paste

 python-routes

 python-suds

-python-netaddr

 python-pastedeploy

 python-greenlet

 python-kombu

@@ -1,4 +1,3 @@

-python-setuptools

 python-gevent

 python-gflags

 python-netifaces

@@ -9,7 +9,6 @@ python-greenlet

 python-netifaces

 python-nose

 python-pastedeploy

-python-setuptools

 python-simplejson

 python-webob

 python-xattr

@@ -7,9 +7,8 @@ openssh

 openssl

 psmisc

 python-cmd2 # dist:opensuse-12.3

-python-netaddr

+python-setuptools

 python-pep8

-python-pip

 python-pylint

 python-unittest2

 python-virtualenv

@@ -15,7 +15,6 @@ python-dateutil

 python-eventlet

 python-kombu

 python-mox

-python-netaddr

 python-nose

 python-pep8

 python-pylint

@@ -7,8 +7,6 @@ python-Routes

 python-SQLAlchemy

 python-WebOb

 python-devel

-python-distribute

-python-setuptools # instead of python-distribute; dist:sle11sp2

 python-greenlet

 python-lxml

 python-mysql

@@ -22,7 +22,6 @@ python-PasteDeploy

 python-Routes

 python-SQLAlchemy

 python-Tempita

-python-boto

 python-carrot

 python-cheetah

 python-eventlet

@@ -34,7 +33,6 @@ python-lockfile

 python-lxml # needed for glance which is needed for nova --- this shouldn't be here

 python-mox

 python-mysql

-python-netaddr

 python-numpy # needed by websockify for spice console

 python-paramiko

 python-python-gflags

@@ -4,13 +4,11 @@ ebtables

 iptables

 iputils

 mysql-community-server # NOPRIME

-python-boto

 python-eventlet

 python-greenlet

 python-iso8601

 python-kombu

 python-mysql

-python-netaddr

 python-Paste

 python-PasteDeploy

 python-pyudev

@@ -1,5 +1,3 @@

-python-distribute

-python-setuptools # instead of python-distribute; dist:sle11sp2

 python-Sphinx

 python-gevent

 python-netifaces

@@ -6,8 +6,6 @@ python-WebOb

 python-configobj

 python-coverage

 python-devel

-python-distribute

-python-setuptools # instead of python-distribute; dist:sle11sp2

 python-eventlet

 python-greenlet

 python-netifaces

@@ -6,9 +6,8 @@ openssh-server

 openssl

 psmisc

 pylint

-python-netaddr

 python-pep8

-python-pip

+python-setuptools

 python-unittest2

 python-virtualenv

 screen

@@ -6,7 +6,6 @@ mod_wsgi  # NOPRIME

 pylint

 python-anyjson

 python-BeautifulSoup

-python-boto

 python-coverage

 python-dateutil

 python-eventlet

@@ -15,7 +14,6 @@ python-httplib2

 python-kombu

 python-migrate

 python-mox

-python-netaddr

 python-nose

 python-paste

 python-paste-deploy

@@ -4,7 +4,6 @@ python-paste

 python-paste-deploy

 python-paste-script

 python-routes

-python-setuptools

 python-sqlalchemy

 python-sqlite2

 python-webob

@@ -15,7 +15,6 @@ numpy # needed by websockify for spice console

 m2crypto

 mysql-server # NOPRIME

 parted

-python-boto

 python-carrot

 python-cheetah

 python-eventlet

@@ -27,7 +26,6 @@ python-kombu

 python-lockfile

 python-migrate

 python-mox

-python-netaddr

 python-paramiko

 python-paste

 python-paste-deploy

@@ -4,12 +4,10 @@ ebtables

 iptables

 iputils

 mysql-server # NOPRIME

-python-boto

 python-eventlet

 python-greenlet

 python-iso8601

 python-kombu

-python-netaddr

 python-paste

 python-paste-deploy

 python-qpid

@@ -1,4 +1,3 @@

-python-setuptools

 python-gevent

 python-gflags

 python-netifaces

@@ -9,7 +9,6 @@ python-greenlet

 python-netifaces

 python-nose

 python-paste-deploy

-python-setuptools

 python-simplejson

 python-webob

 pyxattr

@@ -533,6 +533,9 @@ set -o xtrace

 echo_summary "Installing package prerequisites"

 source $TOP_DIR/tools/install_prereqs.sh

+# Configure an appropriate python environment

+$TOP_DIR/tools/install_pip.sh

+

 install_rpc_backend

 if is_service_enabled $DATABASE_BACKENDS; then

new file mode 100755

@@ -0,0 +1,118 @@

+#!/usr/bin/env bash

+

+# **install_pip.sh**

+

+# install_pip.sh [--pip-version <version>] [--use-get-pip] [--setuptools] [--force]

+#

+# Update pip and friends to a known common version

+

+# Assumptions:

+# - currently we try to leave the system setuptools alone, install

+#   the system package if it is not already present

+# - update pip to $INSTALL_PIP_VERSION

+

+# Keep track of the current directory

+TOOLS_DIR=$(cd $(dirname "$0") && pwd)

+TOP_DIR=`cd $TOOLS_DIR/..; pwd`

+

+# Change dir to top of devstack

+cd $TOP_DIR

+

+# Import common functions

+source $TOP_DIR/functions

+

+FILES=$TOP_DIR/files

+

+# Handle arguments

+

+INSTALL_PIP_VERSION=${INSTALL_PIP_VERSION:-"1.4"}

+while [[ -n "$1" ]]; do

+    case $1 in

+        --force)

+            FORCE=1

+            ;;

+        --pip-version)

+            INSTALL_PIP_VERSION="$2"

+            shift

+            ;;

+        --setuptools)

+            SETUPTOOLS=1

+            ;;

+        --use-get-pip)

+            USE_GET_PIP=1;

+            ;;

+    esac

+    shift

+done

+

+SETUPTOOLS_EZ_SETUP_URL=https://bitbucket.org/pypa/setuptools/raw/bootstrap/ez_setup.py

+PIP_GET_PIP_URL=https://raw.github.com/pypa/pip/master/contrib/get-pip.py

+PIP_TAR_URL=https://pypi.python.org/packages/source/p/pip/pip-$INSTALL_PIP_VERSION.tar.gz

+

+GetDistro

+echo "Distro: $DISTRO"

+

+function get_versions() {

+    PIP=$(which pip 2>/dev/null || which pip-python 2>/dev/null)

+    if [[ -n $PIP ]]; then

+        DISTRIBUTE_VERSION=$($PIP freeze | grep 'distribute==')

+        SETUPTOOLS_VERSION=$($PIP freeze | grep 'setuptools==')

+        PIP_VERSION=$($PIP --version | awk '{ print $2}')

+        echo "pip: $PIP_VERSION  setuptools: $SETUPTOOLS_VERSION  distribute: $DISTRIBUTE_VERSION"

+    fi

+}

+

+function setuptools_ez_setup() {

+    if [[ ! -r $FILES/ez_setup.py ]]; then

+        (cd $FILES; \

+         curl -OR $SETUPTOOLS_EZ_SETUP_URL; \

+        )

+    fi

+    sudo python $FILES/ez_setup.py

+}

+

+function install_get_pip() {

+    if [[ ! -r $FILES/get-pip.py ]]; then

+        (cd $FILES; \

+            curl $PIP_GET_PIP_URL; \

+        )

+    fi

+    sudo python $FILES/get-pip.py

+}

+

+function install_pip_tarball() {

+    curl -O $PIP_TAR_URL

+    tar xvfz pip-$INSTALL_PIP_VERSION.tar.gz

+    cd pip-$INSTALL_PIP_VERSION

+    sudo python setup.py install

+}

+

+# Show starting versions

+get_versions

+

+# Do setuptools

+if [[ -n "$SETUPTOOLS" ]]; then

+    # We want it from source

+    uninstall_package python-setuptools

+    setuptools_ez_setup

+else

+    # See about installing the distro setuptools

+    if ! python -c "import setuptools"; then

+        install_package python-setuptools

+    fi

+fi

+

+# Do pip

+if [[ -z $PIP || "$PIP_VERSION" != "$INSTALL_PIP_VERSION" || -n $FORCE ]]; then

+

+    # Eradicate any and all system packages

+    uninstall_package python-pip

+

+    if [[ -n "$USE_GET_PIP" ]]; then

+        install_get_pip

+    else

+        install_pip_tarball

+    fi

+

+    get_versions

+fi