allow comments in apts/pips list
diff --git a/apts/nova b/apts/nova
index ba563c5..c23a609 100644
--- a/apts/nova
+++ b/apts/nova
@@ -11,9 +11,13 @@
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 4166b4b..7c98f6f 100755
--- a/build.sh
+++ b/build.sh
@@ -15,8 +15,8 @@
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