openstack/devstack
Code Issues Proposed changes

Merge "Use the service catalog when talking to cinder"

Browse Source
This commit is contained in:
Jenkins 2014-12-03 15:56:49 +00:00 committed by Gerrit Code Review
commit 9955d4bd34
1 changed files with 0 additions and 1 deletions
Show Stats 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