openstack/devstack
Code Issues Proposed changes

don't filter \# pips as they mean something, also it seems just libvirt-bin is the issue

Browse Source
This commit is contained in:
Jesse Andrews 2011-09-11 16:23:21 -07:00
parent 1639ed6601
commit f2ef760caa
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build.sh
View File

@ -9,12 +9,12 @@ DEST="/nfs/$NAME"
rm -rf $DEST rm -rf $DEST
# build a proto image - natty + packages that will install (optimization) # build a proto image - natty + packages that will install (optimization)
if [ ! -d nfs ]; then if [ ! -d proto ]; then
debootstrap natty proto debootstrap natty proto
cp sources.list proto/etc/apt/sources.list cp sources.list proto/etc/apt/sources.list
chroot proto apt-get update chroot proto apt-get update
chroot proto apt-get install -y `cat apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt)"` chroot proto apt-get install -y `cat apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin)"`
chroot proto pip install `cat pips/* | cut -d\# -f1` chroot proto pip install `cat pips/*`
git clone https://github.com/cloudbuilders/nova.git proto/opt/nova git clone https://github.com/cloudbuilders/nova.git proto/opt/nova
git clone https://github.com/cloudbuilders/openstackx.git proto/opt/openstackx git clone https://github.com/cloudbuilders/openstackx.git proto/opt/openstackx
git clone https://github.com/cloudbuilders/noVNC.git proto/opt/noVNC git clone https://github.com/cloudbuilders/noVNC.git proto/opt/noVNC

4
stack.sh
View File

@ -54,10 +54,10 @@ function clone_or_up {
# You should only have to run this once # You should only have to run this once
if [ "$CMD" == "install" ]; then if [ "$CMD" == "install" ]; then
# install apt requirements # install apt requirements
apt-get install -y -q `cat $DIR/apts/*` apt-get install -y -q `cat $DIR/apts/* | cut -d\# -f1`
# install python requirements # install python requirements
pip install -r $DIR/pips/dash pip install `cat $DIR/pips/*`
# TODO: kill openstackx # TODO: kill openstackx
clone_or_up https://github.com/cloudbuilders/nova.git $NOVA_DIR clone_or_up https://github.com/cloudbuilders/nova.git $NOVA_DIR