summaryrefslogtreecommitdiffstats
path: root/docker/run_tests.sh
diff options
context:
space:
mode:
authorjose.lausuch <jose.lausuch@ericsson.com>2016-02-02 10:34:06 +0100
committerMorgan Richomme <morgan.richomme@orange.com>2016-02-02 09:51:45 +0000
commit520d85bdc1ec581d26f8ebd90a7b7180ed60c431 (patch)
tree1e7d9fc73d755c25ab11c9741691b4a6920dee21 /docker/run_tests.sh
parent0f2665f9eb28bb2ecaab45a5bd70c87964210ac2 (diff)
Use openstack client to avoid keystone deprecation warnings
Change-Id: Ib82b3f20d0c23fc67201c7159e3b3a6de5c201cf Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com> (cherry picked from commit 906b3b2f7e85f1269d009684b1a557a6c19e96bc)
Diffstat (limited to 'docker/run_tests.sh')
-rwxr-xr-xdocker/run_tests.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/docker/run_tests.sh b/docker/run_tests.sh
index e6b4cfea0..5dd1f872c 100755
--- a/docker/run_tests.sh
+++ b/docker/run_tests.sh
@@ -51,10 +51,10 @@ function clean_openstack(){
}
function odl_tests(){
- keystone_ip=$(keystone catalog --service identity | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
+ keystone_ip=$(openstack catalog show identity |grep publicURL| cut -f3 -d"/" | cut -f1 -d":")
# historically most of the installers use the same IP for neutron and keystone API
neutron_ip=$keystone_ip
- odl_ip=$(keystone catalog --service network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
+ odl_ip=$(openstack catalog show network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
usr_name=$(env | grep OS | grep OS_USERNAME | cut -f2 -d'=')
password=$(env | grep OS | grep OS_PASSWORD | cut -f2 -d'=')
odl_port=8181
@@ -64,7 +64,7 @@ function odl_tests(){
:
elif [ $INSTALLER_TYPE == "joid" ]; then
odl_ip=$(env | grep SDN_CONTROLLER | cut -f2 -d'=')
- neutron_ip=$(keystone catalog --service network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
+ neutron_ip=$(openstack catalog show network | grep publicURL | cut -f3 -d"/" | cut -f1 -d":")
odl_port=8080
:
elif [ $INSTALLER_TYPE == "compass" ]; then