Browse code
Use the service catalog when talking to cinder
The cinder endpoints should be correctly established in the service
catalog. There is no reason to provide an overriding endpoint_template.
Change-Id: I9b206fa22a8271a0fb65789d139ead35dfb1ea0d
Jamie Lennox authored on 2014/11/25 11:10:07Showing 1 changed files
| ... | ... |
@@ -458,7 +458,6 @@ function create_nova_conf {
|
| 458 | 458 |
if is_ssl_enabled_service "cinder" || is_service_enabled tls-proxy; then |
| 459 | 459 |
CINDER_SERVICE_HOST=${CINDER_SERVICE_HOST:-$SERVICE_HOST}
|
| 460 | 460 |
CINDER_SERVICE_PORT=${CINDER_SERVICE_PORT:-8776}
|
| 461 |
- iniset $NOVA_CONF cinder endpoint_template "https://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/%(project_id)s" |
|
| 462 | 461 |
iniset $NOVA_CONF cinder cafile $SSL_BUNDLE_FILE |
| 463 | 462 |
fi |
| 464 | 463 |
fi |