summaryrefslogtreecommitdiffstats
path: root/contrib
diff options
context:
space:
mode:
authorMichael Chapman <michapma@redhat.com>2017-01-25 13:11:36 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-01-25 13:11:36 +0000
commit321339e24396b987cb2ec830b173e0a4445005d6 (patch)
tree4ff58f8fdc7b7c17618552badfbc63b87a1f2546 /contrib
parentb2c83b7b93ac15e41e4788382dcb2c83c0e5ef10 (diff)
parentd78e2cc336523b2357c766ab6775e91b87b4d632 (diff)
Merge "Some bugfixes in simple_deploy.sh"
Diffstat (limited to 'contrib')
-rw-r--r--contrib/simple_deploy.sh14
1 files changed, 7 insertions, 7 deletions
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