Browse code
Merge "Save OPENSTACK_KEYSTONE_URL to horizon local_settings"
Jenkins authored on 2014/06/19 20:34:10Showing 1 changed files
| ... | ... |
@@ -110,7 +110,7 @@ function init_horizon {
|
| 110 | 110 |
fi |
| 111 | 111 |
|
| 112 | 112 |
_horizon_config_set $local_settings "" OPENSTACK_HOST \"${KEYSTONE_SERVICE_HOST}\"
|
| 113 |
- _horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_URL "\"${KEYSTONE_SERVICE_PROTOCOL}://%s:${KEYSTONE_SERVICE_PORT}/v2.0\" % OPENSTACK_HOST"
|
|
| 113 |
+ _horizon_config_set $local_settings "" OPENSTACK_KEYSTONE_URL "\"${KEYSTONE_SERVICE_PROTOCOL}://${KEYSTONE_SERVICE_HOST}:${KEYSTONE_SERVICE_PORT}/v2.0\""
|
|
| 114 | 114 |
|
| 115 | 115 |
if [ -f $SSL_BUNDLE_FILE ]; then |
| 116 | 116 |
_horizon_config_set $local_settings "" OPENSTACK_SSL_CACERT \"${SSL_BUNDLE_FILE}\"
|