Merge remote-tracking branch 'upstream/master'
diff --git a/build_nfs.sh b/build_nfs.sh
index 180a6e5..59a3609 100755
--- a/build_nfs.sh
+++ b/build_nfs.sh
@@ -22,7 +22,8 @@
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/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
cp -pr proto $DEST
diff --git a/stack.sh b/stack.sh
index 93b665a..b47729e 100755
--- a/stack.sh
+++ b/stack.sh
@@ -122,9 +122,13 @@
# install python requirements
sudo PIP_DOWNLOAD_CACHE=/var/cache/pip pip install `cat $FILES/pips/*`
-# git clone only if directory doesn't exist already
+# git clone only if directory doesn't exist already. Since ``DEST`` might not
+# be owned by the installation user, we create the directory and change the
+# ownership to the proper user.
function git_clone {
if [ ! -d $2 ]; then
+ sudo mkdir $2
+ sudo chown `whoami` $2
git clone $1 $2
fi
}
@@ -408,13 +412,13 @@
if [[ "$ENABLED_SERVICES" =~ "g-reg" ]]; then
# Downloads a tty image (ami/aki/ari style), then extracts it. Upon extraction
# we upload to glance with the glance cli tool.
- mkdir -p $DEST/images
- cd $DEST/images
- if [ ! -f $DEST/tty.tgz ]; then
- wget -c http://images.ansolabs.com/tty.tgz -O $DEST/tty.tgz
+ if [ ! -f $FILES/tty.tgz ]; then
+ wget -c http://images.ansolabs.com/tty.tgz -O $FILES/tty.tgz
fi
# extract ami-tty/image, aki-tty/image & ari-tty/image
+ mkdir -p $FILES/images
+ cd $FILES/images
tar -zxf $DEST/tty.tgz
# add images to glance