@@ -2,7 +2,7 @@ dnsmasq-base

 kpartx

 parted

 arping # used for send_arp_for_ha option in nova-network

-mysql-server

+mysql-server # NOPRIME

 python-mysqldb

 kvm

 gawk

@@ -11,10 +11,10 @@ ebtables

 sqlite3

 sudo

 kvm

-libvirt-bin

+libvirt-bin # NOPRIME

 vlan

 curl

-rabbitmq-server

+rabbitmq-server # NOPRIME

 socat # used by ajaxterm

 python-mox

 python-paste

@@ -1,6 +1,6 @@

 curl

 gcc

-memcached

+memcached # NOPRIME

 python-configobj

 python-coverage

 python-dev

@@ -145,8 +145,8 @@ function git_clone {

 # Make sure that base requirements are installed

 cp /etc/resolv.conf $COPY_DIR/etc/resolv.conf

 chroot $COPY_DIR apt-get update

-chroot $COPY_DIR apt-get install -y --force-yes `cat files/apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server|memcached)"`

-chroot $COPY_DIR apt-get install -y --download-only rabbitmq-server libvirt-bin mysql-server

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

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

 chroot $COPY_DIR pip install `cat files/pips/*`

 # Clean out code repos if directed to do so

@@ -125,8 +125,8 @@ fi

 # Make sure that base requirements are installed

 chroot $CACHEDIR apt-get update

-chroot $CACHEDIR apt-get install -y --force-yes `cat files/apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server|memcached)"`

-chroot $CACHEDIR apt-get install -y --download-only rabbitmq-server libvirt-bin mysql-server

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

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

 chroot $CACHEDIR pip install `cat files/pips/*`

 # Clean out code repos if directed to do so

@@ -32,8 +32,9 @@ fi

 # prime natty with as many apt/pips as we can

 if [ ! -d $CHROOTCACHE/natty-dev ]; then

     rsync -azH $CHROOTCACHE/natty-base/ $CHROOTCACHE/natty-dev/

-    chroot $CHROOTCACHE/natty-dev apt-get install -y `cat files/apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server)"`

-    chroot $CHROOTCACHE/natty-dev pip install `cat files/pips/*`

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

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

+    chroot $CHROOTCACHE 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.

@@ -113,7 +113,8 @@ if [ ! -r $DEV_FILE ]; then

     mount -t ext4 ${NBD}p1 $MNTDIR

     cp -p /etc/resolv.conf $MNTDIR/etc/resolv.conf

-    chroot $MNTDIR apt-get install -y `cat files/apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin|mysql-server)"`

+    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