openstack/devstack
Code Issues Proposed changes

Merge "Configure glance CA certificate path in cinder"

Browse Source
This commit is contained in:
Jenkins 2014-10-31 10:31:43 +00:00 committed by Gerrit Code Review
commit 2d18b83600
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/cinder
View File

@ -306,6 +306,7 @@ function configure_cinder {
iniset $CINDER_CONF DEFAULT glance_api_servers "${GLANCE_SERVICE_PROTOCOL}://${GLANCE_HOSTPORT}" iniset $CINDER_CONF DEFAULT glance_api_servers "${GLANCE_SERVICE_PROTOCOL}://${GLANCE_HOSTPORT}"
if is_ssl_enabled_service glance || is_service_enabled tls-proxy; then if is_ssl_enabled_service glance || is_service_enabled tls-proxy; then
iniset $CINDER_CONF DEFAULT glance_protocol https iniset $CINDER_CONF DEFAULT glance_protocol https
iniset $CINDER_CONF DEFAULT glance_ca_certificates_file $SSL_BUNDLE_FILE
fi fi
# Register SSL certificates if provided # Register SSL certificates if provided