summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2016-08-24 17:31:01 +0200
committerCédric Ollivier <cedric.ollivier@orange.com>2016-08-24 17:37:57 +0200
commit683db3a5d67aeead1090008bce7701ffb208a15c (patch)
tree03fb8eb8d46f0d45c3d43bfcedf69f906c696787
parent2002f166154ca5a9380f9d2da2843477669af8f5 (diff)
Use by default the default ODL web port
Change-Id: I7580f02dd5b2db6cf06690ef0163768ea59079fe Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rwxr-xr-xci/exec_test.sh8
1 files changed, 3 insertions, 5 deletions
diff --git a/ci/exec_test.sh b/ci/exec_test.sh
index 03eb2c873..20f7c2d4f 100755
--- a/ci/exec_test.sh
+++ b/ci/exec_test.sh
@@ -44,20 +44,18 @@ function odl_tests(){
keystone_ip=$(openstack catalog show identity |grep publicURL| cut -f3 -d"/" | cut -f1 -d":")
neutron_ip=$(openstack catalog show network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
odl_ip=${neutron_ip}
- odl_port=8181
+ odl_port=8080
if [ "$INSTALLER_TYPE" == "fuel" ]; then
odl_port=8282
elif [ "$INSTALLER_TYPE" == "apex" ]; then
odl_ip=$SDN_CONTROLLER_IP
+ odl_port=8181
elif [ "$INSTALLER_TYPE" == "joid" ]; then
odl_ip=$SDN_CONTROLLER
- odl_port=8080
- :
elif [ "$INSTALLER_TYPE" == "compass" ]; then
- :
+ odl_port=8181
else
odl_ip=$SDN_CONTROLLER_IP
- odl_port=8080
fi
}