openstack/devstack
Code Issues Proposed changes

Merge "Remove excessive verbosity to make log files easier to debug"

Browse Source
This commit is contained in:
Jenkins 2013-02-23 23:12:34 +00:00 committed by Gerrit Code Review
commit b82ba4360f
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tools/xen/install_os_domU.sh
View File

@ -58,8 +58,8 @@ fi
# get nova # get nova
NOVA_ZIPBALL_URL=${NOVA_ZIPBALL_URL:-$(echo $NOVA_REPO | sed "s:\.git$::;s:$:/zipball/$NOVA_BRANCH:g")} NOVA_ZIPBALL_URL=${NOVA_ZIPBALL_URL:-$(echo $NOVA_REPO | sed "s:\.git$::;s:$:/zipball/$NOVA_BRANCH:g")}
wget $NOVA_ZIPBALL_URL -O nova-zipball --no-check-certificate wget -nv $NOVA_ZIPBALL_URL -O nova-zipball --no-check-certificate
unzip -o nova-zipball -d ./nova unzip -q -o nova-zipball -d ./nova
# install xapi plugins # install xapi plugins
XAPI_PLUGIN_DIR=/etc/xapi.d/plugins/ XAPI_PLUGIN_DIR=/etc/xapi.d/plugins/
@ -76,8 +76,8 @@ if [[ "$ENABLED_SERVICES" =~ "q-agt" && "$Q_PLUGIN" = "openvswitch" ]]; then
fi fi
# get quantum # get quantum
QUANTUM_ZIPBALL_URL=${QUANTUM_ZIPBALL_URL:-$(echo $QUANTUM_REPO | sed "s:\.git$::;s:$:/zipball/$QUANTUM_BRANCH:g")} QUANTUM_ZIPBALL_URL=${QUANTUM_ZIPBALL_URL:-$(echo $QUANTUM_REPO | sed "s:\.git$::;s:$:/zipball/$QUANTUM_BRANCH:g")}
wget $QUANTUM_ZIPBALL_URL -O quantum-zipball --no-check-certificate wget -nv $QUANTUM_ZIPBALL_URL -O quantum-zipball --no-check-certificate
unzip -o quantum-zipball -d ./quantum unzip -q -o quantum-zipball -d ./quantum
cp -pr ./quantum/*/quantum/plugins/openvswitch/agent/xenapi/etc/xapi.d/plugins/* $XAPI_PLUGIN_DIR cp -pr ./quantum/*/quantum/plugins/openvswitch/agent/xenapi/etc/xapi.d/plugins/* $XAPI_PLUGIN_DIR
fi fi
@ -386,18 +386,14 @@ fi
WAIT_TILL_LAUNCH=${WAIT_TILL_LAUNCH:-1} WAIT_TILL_LAUNCH=${WAIT_TILL_LAUNCH:-1}
COPYENV=${COPYENV:-1} COPYENV=${COPYENV:-1}
if [ "$WAIT_TILL_LAUNCH" = "1" ] && [ -e ~/.ssh/id_rsa.pub ] && [ "$COPYENV" = "1" ]; then if [ "$WAIT_TILL_LAUNCH" = "1" ] && [ -e ~/.ssh/id_rsa.pub ] && [ "$COPYENV" = "1" ]; then
echo "We're done launching the vm, about to start tailing the" set +x
echo "stack.sh log. It will take a second or two to start."
echo
echo "Just CTRL-C at any time to stop tailing."
echo "VM Launched - Waiting for startup script"
# wait for log to appear # wait for log to appear
while ! ssh_no_check -q stack@$DOMU_IP "[ -e run.sh.log ]"; do while ! ssh_no_check -q stack@$DOMU_IP "[ -e run.sh.log ]"; do
sleep 10 sleep 10
done done
echo -n "Running"
set +x
echo -n "Waiting for startup script to finish"
while [ `ssh_no_check -q stack@$DOMU_IP pgrep -c run.sh` -ge 1 ] while [ `ssh_no_check -q stack@$DOMU_IP pgrep -c run.sh` -ge 1 ]
do do
sleep 10 sleep 10