Execute script in lib folder/Use vjumb as Gateway

Change-Id: I9ad9c9473829fb64ea5ed4f1a21d77aa16615344
Signed-off-by: Nikolas Hermanns <nikolas.hermanns@ericsson.com>

diff --git a/odl-pipeline/lib/deployment_cloner.sh b/odl-pipeline/lib/deployment_cloner.sh
index 9e6afd0..3cb9354 100755 (executable)
--- a/odl-pipeline/lib/deployment_cloner.sh
+++ b/odl-pipeline/lib/deployment_cloner.sh
@@ -3,4 +3,5 @@ DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 set -e
 export PYTHONPATH=$PYTHONPATH:$DIR
 mkdir -p $DIR/tmp
-python $DIR/deployment_cloner/deployment_cloner.py $@
+cd $DIR
+python ./deployment_cloner/deployment_cloner.py $@

diff --git a/odl-pipeline/lib/odl_reinstaller.sh b/odl-pipeline/lib/odl_reinstaller.sh
index 0c3c8c5..4923ed0 100755 (executable)
--- a/odl-pipeline/lib/odl_reinstaller.sh
+++ b/odl-pipeline/lib/odl_reinstaller.sh
@@ -3,4 +3,5 @@ DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 set -e
 export PYTHONPATH=$PYTHONPATH:$DIR
 mkdir -p $DIR/tmp
-python $DIR/odl_reinstaller/odl_reinstaller.py $@
+cd $DIR
+python ./odl_reinstaller/odl_reinstaller.py $@

diff --git a/odl-pipeline/lib/test_environment.sh b/odl-pipeline/lib/test_environment.sh
index 56601f4..520f36a 100755 (executable)
--- a/odl-pipeline/lib/test_environment.sh
+++ b/odl-pipeline/lib/test_environment.sh
@@ -3,4 +3,5 @@ DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
 set -e
 export PYTHONPATH=$PYTHONPATH:$DIR
 mkdir -p $DIR/tmp
-python $DIR/test_environment/test_environment.py $@
+cd $DIR
+python ./test_environment/test_environment.py $@

diff --git a/odl-pipeline/lib/tripleo_manager.sh b/odl-pipeline/lib/tripleo_manager.sh
index f4f10cf..9c999a3 100755 (executable)
--- a/odl-pipeline/lib/tripleo_manager.sh
+++ b/odl-pipeline/lib/tripleo_manager.sh
@@ -6,4 +6,5 @@ fi
 set -e
 export PYTHONPATH=$PYTHONPATH:$DIR
 mkdir -p $DIR/tmp
-python $DIR/tripleo_manager/tripleo_manager.py $@
+cd $DIR
+python ./tripleo_manager/tripleo_manager.py $@

diff --git a/odl-pipeline/templates/ifcfg-enp0s4 b/odl-pipeline/templates/ifcfg-enp0s4
index d7751dd..0c94390 100644 (file)
--- a/odl-pipeline/templates/ifcfg-enp0s4
+++ b/odl-pipeline/templates/ifcfg-enp0s4
@@ -1,5 +1,5 @@
 # br-admin
 auto enp0s4
 iface enp0s4 inet static
-  address 192.0.2.199
+  address 192.0.2.1
   netmask 255.255.255.0
\ No newline at end of file

diff --git a/odl-pipeline/templates/ifcfg-enp0s6 b/odl-pipeline/templates/ifcfg-enp0s6
index e25dc4e..5032846 100644 (file)
--- a/odl-pipeline/templates/ifcfg-enp0s6
+++ b/odl-pipeline/templates/ifcfg-enp0s6
@@ -1,5 +1,5 @@
 # br-public
 auto enp0s6
 iface enp0s6 inet static
-  address 192.168.37.199
+  address 192.168.37.1
   netmask 255.255.255.0
\ No newline at end of file