@@ -779,10 +779,6 @@ if [[ $TRACK_DEPENDS = True ]] ; then

     $DEST/.venv/bin/pip freeze > $DEST/requires-pre-pip

 fi

-# Install python requirements

-echo_summary "Installing Python prerequisites"

-pip_install $(get_packages $FILES/pips | sort -u)

-

 # Check Out Source

 # ----------------

@@ -108,7 +108,7 @@ function map_nbd {

     echo $NBD

 }

-# Prime image with as many apt/pips as we can

+# Prime image with as many apt as we can

 DEV_FILE=$CACHEDIR/$DIST_NAME-dev.img

 DEV_FILE_TMP=`mktemp $DEV_FILE.XXXXXX`

 if [ ! -r $DEV_FILE ]; then

@@ -121,7 +121,6 @@ if [ ! -r $DEV_FILE ]; then

     chroot $MNTDIR apt-get install -y --download-only `cat files/apts/* | grep NOPRIME | cut -d\# -f1`

     chroot $MNTDIR apt-get install -y --force-yes `cat files/apts/* | grep -v NOPRIME | cut -d\# -f1`

-    chroot $MNTDIR pip install `cat files/pips/*`

     # Create a stack user that is a member of the libvirtd group so that stack

     # is able to interact with libvirt.

@@ -48,8 +48,6 @@ DEST=${DEST:-/opt/stack}

 TEMPEST_DIR=$DEST/tempest

 # Install tests and prerequisites

-pip_install `cat $TOP_DIR/files/pips/tempest`

-

 git_clone $TEMPEST_REPO $TEMPEST_DIR $TEMPEST_BRANCH

 trap - SIGHUP SIGINT SIGTERM SIGQUIT EXIT

@@ -68,7 +68,7 @@ fi

 # Option to warm the base image with software requirements.

 if [ $WARM_CACHE ]; then

     cd $TOOLS_DIR

-    ./warm_apts_and_pips_for_uec.sh $image_dir/disk

+    ./warm_apts_for_uec.sh $image_dir/disk

 fi

 # Name of our instance, used by libvirt

@@ -98,7 +98,7 @@ GUEST_NAME=${GUEST_NAME:-devstack}

 # Pre-load the image with basic environment

 if [ ! -e $image_dir/disk-primed ]; then

     cp $image_dir/disk $image_dir/disk-primed

-    $TOOLS_DIR/warm_apts_and_pips_for_uec.sh $image_dir/disk-primed

+    $TOOLS_DIR/warm_apts_for_uec.sh $image_dir/disk-primed

     $TOOLS_DIR/copy_dev_environment_to_uec.sh $image_dir/disk-primed

 fi

deleted file mode 100755

@@ -1,55 +0,0 @@

-#!/usr/bin/env bash

-

-# **warm_apts_and_pips_for_uec.sh**

-

-# Echo commands

-set -o xtrace

-

-# Exit on error to stop unexpected errors

-set -o errexit

-

-# 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

-

-# Echo usage

-usage() {

-    echo "Cache OpenStack dependencies on a uec image to speed up performance."

-    echo ""

-    echo "Usage: $0 [full path to raw uec base image]"

-}

-

-# Make sure this is a raw image

-if ! qemu-img info $1 | grep -q "file format: raw"; then

-    usage

-    exit 1

-fi

-

-# Make sure we are in the correct dir

-if [ ! -d files/apts ]; then

-    echo "Please run this script from devstack/tools/"

-    exit 1

-fi

-

-# Mount the image

-STAGING_DIR=/tmp/`echo $1 | sed  "s/\//_/g"`.stage

-mkdir -p $STAGING_DIR

-umount $STAGING_DIR || true

-sleep 1

-mount -t ext4 -o loop $1 $STAGING_DIR

-

-# Make sure that base requirements are installed

-cp /etc/resolv.conf $STAGING_DIR/etc/resolv.conf

-

-# Perform caching on the base image to speed up subsequent runs

-chroot $STAGING_DIR apt-get update

-chroot $STAGING_DIR apt-get install -y --download-only `cat files/apts/* | grep NOPRIME | cut -d\# -f1`

-chroot $STAGING_DIR apt-get install -y --force-yes `cat files/apts/* | grep -v NOPRIME | cut -d\# -f1` || true

-mkdir -p $STAGING_DIR/var/cache/pip

-PIP_DOWNLOAD_CACHE=/var/cache/pip chroot $STAGING_DIR pip install `cat files/pips/*` || true

-

-# Unmount

-umount $STAGING_DIR

new file mode 100755

@@ -0,0 +1,53 @@

+#!/usr/bin/env bash

+

+# **warm_apts_for_uec.sh**

+

+# Echo commands

+set -o xtrace

+

+# Exit on error to stop unexpected errors

+set -o errexit

+

+# 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

+

+# Echo usage

+usage() {

+    echo "Cache OpenStack dependencies on a uec image to speed up performance."

+    echo ""

+    echo "Usage: $0 [full path to raw uec base image]"

+}

+

+# Make sure this is a raw image

+if ! qemu-img info $1 | grep -q "file format: raw"; then

+    usage

+    exit 1

+fi

+

+# Make sure we are in the correct dir

+if [ ! -d files/apts ]; then

+    echo "Please run this script from devstack/tools/"

+    exit 1

+fi

+

+# Mount the image

+STAGING_DIR=/tmp/`echo $1 | sed  "s/\//_/g"`.stage

+mkdir -p $STAGING_DIR

+umount $STAGING_DIR || true

+sleep 1

+mount -t ext4 -o loop $1 $STAGING_DIR

+

+# Make sure that base requirements are installed

+cp /etc/resolv.conf $STAGING_DIR/etc/resolv.conf

+

+# Perform caching on the base image to speed up subsequent runs

+chroot $STAGING_DIR apt-get update

+chroot $STAGING_DIR apt-get install -y --download-only `cat files/apts/* | grep NOPRIME | cut -d\# -f1`

+chroot $STAGING_DIR apt-get install -y --force-yes `cat files/apts/* | grep -v NOPRIME | cut -d\# -f1` || true

+

+# Unmount

+umount $STAGING_DIR