diff --git a/lib/horizon b/lib/horizon index 6ecd755795..ff63b06ab2 100644 --- a/lib/horizon +++ b/lib/horizon @@ -99,13 +99,8 @@ function init_horizon { _horizon_config_set $local_settings "" OPENSTACK_HOST \"${KEYSTONE_SERVICE_HOST}\" - if [ "$ENABLE_IDENTITY_V2" == "False" ]; then - # Only Identity v3 API is available; then use it with v3 auth tokens - _horizon_config_set $local_settings "" OPENSTACK_API_VERSIONS {\"identity\":3} - _horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_URL "\"${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:${KEYSTONE_SERVICE_PORT}/v3\"" - else - _horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_URL "\"${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:${KEYSTONE_SERVICE_PORT}/v2.0\"" - fi + _horizon_config_set $local_settings "" OPENSTACK_API_VERSIONS {\"identity\":3} + _horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_URL "\"${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:${KEYSTONE_SERVICE_PORT}/v3\"" if [ -f $SSL_BUNDLE_FILE ]; then _horizon_config_set $local_settings "" OPENSTACK_SSL_CACERT \"${SSL_BUNDLE_FILE}\"