more work on multi-lxc

This commit is contained in:
Anthony Young 2011-09-14 01:58:01 -07:00
parent d74d681d3f
commit 927a656ac2
2 changed files with 5 additions and 2 deletions

View file

@ -120,13 +120,16 @@ cat > $RUN_SH <<EOF
echo "nameserver $NAMESERVER" | resolvconf -a eth0 echo "nameserver $NAMESERVER" | resolvconf -a eth0
sleep 1 sleep 1
# Kill any existing screens
sudo -c "killall screen" stack
# Install and run stack.sh # Install and run stack.sh
apt-get update apt-get update
apt-get -y --force-yes install git-core vim-nox sudo apt-get -y --force-yes install git-core vim-nox sudo
if [ ! -d "/opt/nfs-stack" ]; then if [ ! -d "/opt/nfs-stack" ]; then
su -c "git clone git://github.com/cloudbuilders/nfs-stack.git ~/nfs-stack" stack su -c "git clone git://github.com/cloudbuilders/nfs-stack.git ~/nfs-stack" stack
fi fi
nohup su -c "cd ~/nfs-stack && $STACKSH_PARAMS ./stack.sh" stack &> /opt/run.sh.log su -c "cd ~/nfs-stack && $STACKSH_PARAMS ./stack.sh" stack &> /opt/run.sh.log
EOF EOF
# Make the run.sh executable # Make the run.sh executable

View file

@ -37,7 +37,7 @@ API_DIR=$DEST/openstackx
NOVNC_DIR=$DEST/noVNC NOVNC_DIR=$DEST/noVNC
# Specify which services to launch. These generally correspond to screen tabs # Specify which services to launch. These generally correspond to screen tabs
ENABLED_SERVICES=g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,dash ENABLED_SERVICES=${ENABLED_SERVICES:-g-api,g-reg,key,n-api,n-cpu,n-net,n-sch,n-vnc,dash}
# Use the first IP unless an explicit is set by ``HOST_IP`` environment variable # Use the first IP unless an explicit is set by ``HOST_IP`` environment variable
if [ ! -n "$HOST_IP" ]; then if [ ! -n "$HOST_IP" ]; then