Code Review
/
apex.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix nosdn fdio scenario
[apex.git]
/
contrib
/
simple_deploy.sh
diff --git
a/contrib/simple_deploy.sh
b/contrib/simple_deploy.sh
old mode 100644
(file)
new mode 100755
(executable)
index
6ad727d
..
8da9272
--- a/
contrib/simple_deploy.sh
+++ b/
contrib/simple_deploy.sh
@@
-1,19
+1,13
@@
#!/bin/bash
set -e
apex_home=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../
#!/bin/bash
set -e
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
+export PYTHONPATH=$apex_home/apex:$PYTHONPATH
$apex_home/ci/dev_dep_check.sh || true
$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
+pip3 install -r $apex_home/requirements.txt
+pushd $apex_home/apex
+python3 clean.py
echo "All further output will be piped to $PWD/nohup.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 &)
+(nohup python3 deploy.py -v -n ../config/network/network_settings.yaml -d ../config/deploy/os-nosdn-nofeature-noha.yaml --deploy-dir ../build --lib-dir ../lib --image-dir ../.build &)
+[ -f nohup.out ] || sleep 3
tail -f nohup.out
popd
tail -f nohup.out
popd