Browse code

Merge "Configure glance CA certificate path in cinder"

Jenkins authored on 2014/10/31 19:31:43
Showing 1 changed files
... ...
@@ -306,6 +306,7 @@ function configure_cinder {
306 306
     iniset $CINDER_CONF DEFAULT glance_api_servers "${GLANCE_SERVICE_PROTOCOL}://${GLANCE_HOSTPORT}"
307 307
     if is_ssl_enabled_service glance || is_service_enabled tls-proxy; then
308 308
         iniset $CINDER_CONF DEFAULT glance_protocol https
309
+        iniset $CINDER_CONF DEFAULT glance_ca_certificates_file $SSL_BUNDLE_FILE
309 310
     fi
310 311
 
311 312
     # Register SSL certificates if provided