diff options
| -rwxr-xr-x | docker/run_tests.sh | 2 | ||||
| -rwxr-xr-x | testcases/Controllers/ODL/CI/start_tests.sh | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/docker/run_tests.sh b/docker/run_tests.sh index 9e2021669..7c5349ae2 100755 --- a/docker/run_tests.sh +++ b/docker/run_tests.sh @@ -53,7 +53,7 @@ function clean_openstack(){ function odl_tests(){ keystone_ip=$(keystone catalog --service 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 + neutron_ip=$keystone_ip odl_ip=$(keystone catalog --service 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'=') diff --git a/testcases/Controllers/ODL/CI/start_tests.sh b/testcases/Controllers/ODL/CI/start_tests.sh index 5b45a2e92..3800b6307 100755 --- a/testcases/Controllers/ODL/CI/start_tests.sh +++ b/testcases/Controllers/ODL/CI/start_tests.sh @@ -51,7 +51,7 @@ ODL_PORT=${ODL_PORT:-8081} USR_NAME=${USR_NAME:-'neutron'} PASS=${PASS:-'octopus'} NEUTRON_IP=${NEUTRON_IP:-192.168.0.68} -KEYSTONE_IP=${NEUTRON_IP:-192.168.0.69} +KEYSTONE_IP=${KEYSTONE_IP:-192.168.0.69} set +x init_file=${REPO_DIR}/test/csit/suites/openstack/neutron/__init__.robot |