don't filter \# pips as they mean something, also it seems just libvirt-bin is the issue
This commit is contained in:
parent
1639ed6601
commit
f2ef760caa
2 changed files with 5 additions and 5 deletions
6
build.sh
6
build.sh
|
@ -9,12 +9,12 @@ DEST="/nfs/$NAME"
|
|||
rm -rf $DEST
|
||||
|
||||
# build a proto image - natty + packages that will install (optimization)
|
||||
if [ ! -d nfs ]; then
|
||||
if [ ! -d proto ]; then
|
||||
debootstrap natty proto
|
||||
cp sources.list proto/etc/apt/sources.list
|
||||
chroot proto apt-get update
|
||||
chroot proto apt-get install -y `cat apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt)"`
|
||||
chroot proto pip install `cat pips/* | cut -d\# -f1`
|
||||
chroot proto apt-get install -y `cat apts/* | cut -d\# -f1 | egrep -v "(rabbitmq|libvirt-bin)"`
|
||||
chroot proto pip install `cat pips/*`
|
||||
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/noVNC.git proto/opt/noVNC
|
||||
|
|
4
stack.sh
4
stack.sh
|
@ -54,10 +54,10 @@ function clone_or_up {
|
|||
# You should only have to run this once
|
||||
if [ "$CMD" == "install" ]; then
|
||||
# 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
|
||||
pip install -r $DIR/pips/dash
|
||||
pip install `cat $DIR/pips/*`
|
||||
|
||||
# TODO: kill openstackx
|
||||
clone_or_up https://github.com/cloudbuilders/nova.git $NOVA_DIR
|
||||
|
|
Loading…
Reference in a new issue