summaryrefslogtreecommitdiffstats
path: root/docker
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-01-28 10:00:12 +0100
committerMorgan Richomme <morgan.richomme@orange.com>2016-01-28 09:41:27 +0000
commit74a3a087033a3607c675f8d812f9d9940d32686a (patch)
tree1521a130a6540e99c8c685c4300cb6ff8563ec43 /docker
parent8d5649099d51db553c643bbca815ecdd4d5adde7 (diff)
Follow change in joid use SDN_CONTROLLER_IP env var instead of ODL_CONTROLLER_IP
Change-Id: I298cfdfe880c52a18580eb607294cf4c7f353e71 Signed-off-by: Morgan Richomme <morgan.richomme@orange.com> (cherry picked from commit 73f040dd4998cadfbaa7b0706a441ae6ce6f6ffc)
Diffstat (limited to 'docker')
-rwxr-xr-xdocker/run_tests.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index d24a00948..8fab51f6e 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -63,7 +63,7 @@ function odl_tests(){
elif [ $INSTALLER_TYPE == "apex" ]; then
:
elif [ $INSTALLER_TYPE == "joid" ]; then
- odl_ip=$(env | grep ODL_CONTROLLER | cut -f2 -d'=')
+ odl_ip=$(env | grep SDN_CONTROLLER | cut -f2 -d'=')
neutron_ip=$(keystone catalog --service network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
odl_port=8080
: