commit 2d18b83600bf53df3a41aec619eee67328fe154f
author Jenkins <jenkins@review.openstack.org> Fri Oct 31 10:31:43 2014 +0000
committer Gerrit Code Review <review@openstack.org> Fri Oct 31 10:31:43 2014 +0000
tree a7378b8308093aaf925c3285aca4265ba819a0cc
parent 84ff9b09e64e92581fbf1d9e1247ee55bca4d4f6
parent 4b109297d5b3dcdcdc2c7e4df1a1571cc674ee9f

Merge "Configure glance CA certificate path in cinder"

lib/cinder

diff --git a/lib/cinder b/lib/cinder
index b30a036..29cda42 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -306,6 +306,7 @@
     iniset $CINDER_CONF DEFAULT glance_api_servers "${GLANCE_SERVICE_PROTOCOL}://${GLANCE_HOSTPORT}"
     if is_ssl_enabled_service glance || is_service_enabled tls-proxy; then
         iniset $CINDER_CONF DEFAULT glance_protocol https
+        iniset $CINDER_CONF DEFAULT glance_ca_certificates_file $SSL_BUNDLE_FILE
     fi
 
     # Register SSL certificates if provided