Browse code

Merge "Use new cafile option in nova cinder options"

Jenkins authored on 2014/12/04 00:56:44
Showing 1 changed files
... ...
@@ -459,7 +459,7 @@ function create_nova_conf {
459 459
             CINDER_SERVICE_HOST=${CINDER_SERVICE_HOST:-$SERVICE_HOST}
460 460
             CINDER_SERVICE_PORT=${CINDER_SERVICE_PORT:-8776}
461 461
             iniset $NOVA_CONF cinder endpoint_template "https://$CINDER_SERVICE_HOST:$CINDER_SERVICE_PORT/v1/%(project_id)s"
462
-            iniset $NOVA_CONF cinder ca_certificates_file $SSL_BUNDLE_FILE
462
+            iniset $NOVA_CONF cinder cafile $SSL_BUNDLE_FILE
463 463
         fi
464 464
     fi
465 465