From 0cedf1dc636d2532eb818dd88c19106199500ac7 Mon Sep 17 00:00:00 2001
From: Tim Rozet <trozet@redhat.com>
Date: Tue, 5 Sep 2017 15:23:15 -0400
Subject: Remove deploy.sh and references

Deploy is now pip/rpm installed as opnfv-deploy in /bin.  Alternatively
the deploy.py script can be invoked via python.  The legacy deploy.sh
was only being used for CI, which has now been updated to remove the
need for the Apex repo containing ci/deploy.sh.

Change-Id: I1fb93bd9de23a97a09bedb8ac014ef81955875f2
Signed-off-by: Tim Rozet <trozet@redhat.com>
---
 contrib/simple_deploy.sh | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

(limited to 'contrib')

diff --git a/contrib/simple_deploy.sh b/contrib/simple_deploy.sh
index 24b67904..d6d07f38 100755
--- a/contrib/simple_deploy.sh
+++ b/contrib/simple_deploy.sh
@@ -1,20 +1,13 @@
 #!/bin/bash
 set -e
 apex_home=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )/../
-export BASE=$apex_home/build
-export LIB=$apex_home/lib
-export IMAGES=$apex_home/.build/
-export PYTHONPATH=$PYTHONPATH:$apex_home/lib/python
+export PYTHONPATH=$apex_home/apex:$PYTHONPATH
 $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
 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-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
-- 
cgit 1.2.3-korg