allow comments in apts/pips list

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

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