summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNikolas Hermanns <nikolas.hermanns@ericsson.com>2016-12-14 12:25:36 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-14 12:25:36 +0000
commit4b652d4fce581014938483d24a9ec6e7a28b1632 (patch)
tree1f06ac6b1aecfa67000701cdf0bd0bb2a4712308
parent033ddcc028b083df3ec9c077c6cb4bc53f4dc5d3 (diff)
parentec8d50466e46da47e927d53ca55939fdfde42415 (diff)
Merge "Execute script in lib folder/Use vjumb as Gateway"
-rwxr-xr-xodl-pipeline/lib/deployment_cloner.sh3
-rwxr-xr-xodl-pipeline/lib/odl_reinstaller.sh3
-rwxr-xr-xodl-pipeline/lib/test_environment.sh3
-rwxr-xr-xodl-pipeline/lib/tripleo_manager.sh3
-rw-r--r--odl-pipeline/templates/ifcfg-enp0s42
-rw-r--r--odl-pipeline/templates/ifcfg-enp0s62
6 files changed, 10 insertions, 6 deletions
diff --git a/odl-pipeline/lib/deployment_cloner.sh b/odl-pipeline/lib/deployment_cloner.sh
index 9e6afd0..3cb9354 100755
--- 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
--- 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
--- 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
--- 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
--- 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
--- 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