openstack/devstack
Code Issues Proposed changes

Use the service catalog when talking to cinder

Browse Source 
The cinder endpoints should be correctly established in the service
catalog. There is no reason to provide an overriding endpoint_template.

Change-Id: I9b206fa22a8271a0fb65789d139ead35dfb1ea0d
This commit is contained in:
Jamie Lennox
2014-11-25 12:10:07 +10:00
parent 55c7ebbdba
commit d7af484338
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/nova
View File

@@ -458,7 +458,6 @@ function create_nova_conf {
if is_ssl_enabled_service "cinder" || is_service_enabled tls-proxy; then
CINDER_SERVICE_HOST=${CINDER_SERVICE_HOST:-$SERVICE_HOST}
CINDER_SERVICE_PORT=${CINDER_SERVICE_PORT:-8776}
iniset $NOVA_CONF cinder endpoint_template "https://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/%(project_id)s"
iniset $NOVA_CONF cinder cafile $SSL_BUNDLE_FILE
fi
fi