don't download images to /opt

This commit is contained in:
Jesse Andrews 2011-09-16 14:16:36 -07:00
parent 291e72b0d7
commit 543d7d44e9
2 changed files with 6 additions and 5 deletions

View File

@ -22,7 +22,8 @@ if [ ! -d proto ]; then
git clone https://github.com/cloudbuilders/python-novaclient.git proto/opt/python-novaclient git clone https://github.com/cloudbuilders/python-novaclient.git proto/opt/python-novaclient
git clone https://github.com/cloudbuilders/keystone.git proto/opt/keystone git clone https://github.com/cloudbuilders/keystone.git proto/opt/keystone
git clone https://github.com/cloudbuilders/glance.git proto/opt/glance git clone https://github.com/cloudbuilders/glance.git proto/opt/glance
wget -c http://images.ansolabs.com/tty.tgz -O proto/opt/tty.tgz chroot proto mkdir -p /opt/files
wget -c http://images.ansolabs.com/tty.tgz -O proto/opt/files/tty.tgz
fi fi
cp -pr proto $DEST cp -pr proto $DEST

View File

@ -412,13 +412,13 @@ screen_it dash "sudo /etc/init.d/apache2 restart; sudo tail -f /var/log/apache2/
if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then
# Downloads a tty image (ami/aki/ari style), then extracts it. Upon extraction # Downloads a tty image (ami/aki/ari style), then extracts it. Upon extraction
# we upload to glance with the glance cli tool. # we upload to glance with the glance cli tool.
mkdir -p $DEST/images if [ ! -f $FILES/tty.tgz ]; then
cd $DEST/images wget -c http://images.ansolabs.com/tty.tgz -O $FILES/tty.tgz
if [ ! -f $DEST/tty.tgz ]; then
wget -c http://images.ansolabs.com/tty.tgz -O $DEST/tty.tgz
fi fi
# extract ami-tty/image, aki-tty/image & ari-tty/image # extract ami-tty/image, aki-tty/image & ari-tty/image
mkdir -p $FILES/images
cd $FILES/images
tar -zxf $DEST/tty.tgz tar -zxf $DEST/tty.tgz
# add images to glance # add images to glance