Merge "Use new cafile option in nova cinder options"

This commit is contained in:
Jenkins 2014-12-03 15:56:44 +00:00 committed by Gerrit Code Review
commit 327afc9962

View File

@ -459,7 +459,7 @@ function create_nova_conf {
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 ca_certificates_file $SSL_BUNDLE_FILE
iniset $NOVA_CONF cinder cafile $SSL_BUNDLE_FILE
fi
fi