From 8622bf2f398f95d7d85e53eb279df1116d9d13ea Mon Sep 17 00:00:00 2001
From: Jesse Andrews <anotherjesse@gmail.com>
Date: Sun, 11 Sep 2011 15:27:54 -0700
Subject: [PATCH] allow comments in apts/pips list

---
 apts/nova | 8 ++++++--
 build.sh  | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/apts/nova b/apts/nova
index ba563c5520..c23a609dfc 100644
--- a/apts/nova
+++ b/apts/nova
@@ -11,9 +11,13 @@ libvirt-bin
 vlan
 curl
 rabbitmq-server
-socat
+erlang-base # install erlang deps for rabbit explicitly since we don't install rabbit during bootstrap
+erlang-ssl 
+erlang-nox
+erlang-inets
+erlang-mnesia
+socat # used by ajaxterm
 python-mox
-python-ipy
 python-paste
 python-migrate
 python-gflags
diff --git a/build.sh b/build.sh
index 4166b4b2cf..7c98f6fd27 100755
--- a/build.sh
+++ b/build.sh
@@ -15,8 +15,8 @@ if [ ! -d nfs ]; then
     debootstrap natty nfs
     cp sources.list nfs/etc/apt/sources.list
     chroot nfs apt-get update
-    chroot nfs apt-get install -y `cat apts/* | egrep -v "(rabbitmq|libvirt)"`
-    chroot nfs pip install `cat pips/*`
+    chroot nfs apt-get install -y `cat apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt)"`
+    chroot nfs pip install `cat pips/* | cut -d\# -f1`
     git clone https://github.com/cloudbuilders/nova.git nfs/opt/nova
     git clone https://github.com/cloudbuilders/openstackx.git nfs/opt/openstackx
     git clone https://github.com/cloudbuilders/noVNC.git nfs/opt/noVNC