From d78e2cc336523b2357c766ab6775e91b87b4d632 Mon Sep 17 00:00:00 2001 From: Nikolas Hermanns Date: Mon, 23 Jan 2017 05:07:22 -0500 Subject: Some bugfixes in simple_deploy.sh Change-Id: I553beedc6195dd4714ba6cb388036da2bd7a355d Signed-off-by: Nikolas Hermanns --- contrib/simple_deploy.sh | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'contrib') diff --git a/contrib/simple_deploy.sh b/contrib/simple_deploy.sh index f4b082ae..6ad727d5 100644 --- a/contrib/simple_deploy.sh +++ b/contrib/simple_deploy.sh @@ -1,19 +1,19 @@ #!/bin/bash set -e -apex_home=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd ) +apex_home=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../ export CONFIG=$apex_home/build export LIB=$apex_home/lib export RESOURCES=$apex_home/.build/images/ export PYTHONPATH=$PYTHONPATH:$apex_home/lib/python -$apex_home/ci/dev_dep_check.sh +$apex_home/ci/dev_dep_check.sh || true +$apex_home/ci/clean.sh pushd $apex_home/build make clean make undercloud make overcloud-opendaylight +popd pushd $apex_home/ci -./clean.sh -./dev_dep_check.sh -out=/tmp/opnfv-deploy.out -echo "All further output will be piped to $out" -(nohup ./deploy.sh -v -n $apex_home/config/network/network_settings.yaml -d $apex_home/config/deploy/os-odl_l3-nofeature-noha.yaml &> $out &) +echo "All further output will be piped to $PWD/nohup.out" +(nohup ./deploy.sh -v -n $apex_home/config/network/network_settings.yaml -d $apex_home/config/deploy/os-odl_l3-nofeature-noha.yaml &) +tail -f nohup.out popd -- cgit 1.2.3-korg