...
|
...
|
@@ -99,13 +99,8 @@ function init_horizon {
|
99
|
99
|
|
100
|
100
|
_horizon_config_set $local_settings "" OPENSTACK_HOST \"${KEYSTONE_SERVICE_HOST}\"
|
101
|
101
|
|
102
|
|
- if [ "$ENABLE_IDENTITY_V2" == "False" ]; then
|
103
|
|
- # Only Identity v3 API is available; then use it with v3 auth tokens
|
104
|
|
- _horizon_config_set $local_settings "" OPENSTACK_API_VERSIONS {\"identity\":3}
|
105
|
|
- _horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_URL "\"${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:${KEYSTONE_SERVICE_PORT}/v3\""
|
106
|
|
- else
|
107
|
|
- _horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_URL "\"${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:${KEYSTONE_SERVICE_PORT}/v2.0\""
|
108
|
|
- fi
|
|
102
|
+ _horizon_config_set $local_settings "" OPENSTACK_API_VERSIONS {\"identity\":3}
|
|
103
|
+ _horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_URL "\"${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:${KEYSTONE_SERVICE_PORT}/v3\""
|
109
|
104
|
|
110
|
105
|
if [ -f $SSL_BUNDLE_FILE ]; then
|
111
|
106
|
_horizon_config_set $local_settings "" OPENSTACK_SSL_CACERT \"${SSL_BUNDLE_FILE}\"
|