openstack
/
murano-deployment
Code Issues Proposed changes

Merge "Fix keystone url for liberty"

This commit is contained in:
Jenkins 2016-07-07 14:36:25 +00:00 committed by Gerrit Code Review
parent c8ed8927c3 c245a2b781
commit 531c9e42be
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
murano-ci/scripts/functions.inc
View File

@ -126,7 +126,11 @@ function get_floating_ip() {
export OS_USERNAME=${ADMIN_USERNAME}
export OS_PASSWORD=${ADMIN_PASSWORD}
export OS_TENANT_NAME=${ADMIN_TENANT}
export OS_AUTH_URL="http://${OPENSTACK_HOST}:5000/v3"
if [[ ${ZUUL_BRANCH} =~ liberty ]]; then
export OS_AUTH_URL="http://${OPENSTACK_HOST}:5000/v2.0"
else
export OS_AUTH_URL="http://${OPENSTACK_HOST}:5000/v3"
fi
FLOATING_IP_ADDRESS=$("${tmp_venv}/bin/nova" floating-ip-list | grep " ${FOUND_IP_ADDRESS} " | cut -d ' ' -f 4)

11
murano-ci/scripts/prepare_tests.sh
View File

@ -143,13 +143,22 @@ function prepare_tests() {
set_config "${section_name}" 'horizon_url' "$(shield_slashes http://${FOUND_IP_ADDRESS}/$DASHBOARD_PATH)" "${config_file}"
if [[ ${ZUUL_BRANCH} =~ liberty ]]; then
set_config "${section_name}" 'keystone_url' "$(shield_slashes http://${OPENSTACK_HOST}:5000/v2.0/)" "${config_file}"
else
set_config "${section_name}" 'keystone_url' "$(shield_slashes http://${OPENSTACK_HOST}:5000/v3)" "${config_file}"
fi
set_config "${section_name}" 'keystone_url' "$(shield_slashes http://${OPENSTACK_HOST}:5000/v3)" "${config_file}"
set_config "${section_name}" 'murano_url' "$(shield_slashes http://${FOUND_IP_ADDRESS}:8082/)" "${config_file}"
set_config "${section_name}" 'user' "${ADMIN_USERNAME}" "${config_file}"
set_config "${section_name}" 'password' "${ADMIN_PASSWORD}" "${config_file}"
set_config "${section_name}" 'tenant' "${ADMIN_TENANT}" "${config_file}"
set_config "${section_name}" 'linux_image' "${LINUX_IMAGE}" "${config_file}"
set_config "${section_name}" 'auth_url' "$(shield_slashes http://${OPENSTACK_HOST}:5000/v3)" "${config_file}"
if [[ ${ZUUL_BRANCH} =~ liberty ]]; then
set_config "${section_name}" 'auth_url' "$(shield_slashes http://${OPENSTACK_HOST}:5000/v2.0/)" "${config_file}"
else
set_config "${section_name}" 'auth_url' "$(shield_slashes http://${OPENSTACK_HOST}:5000/v3)" "${config_file}"
fi
prepare_murano_apps "${PROJECT_TESTS_DIR}"