commit 55c7ebbdbaf97c8f1f22d8a06579edf836b503c6
author Jamie Lennox <jamielennox@redhat.com> Tue Nov 25 12:08:55 2014 +1000
committer Jamie Lennox <jamielennox@redhat.com> Tue Nov 25 12:09:58 2014 +1000
tree 4cce02043e5049765ee958e0f41dae4b088c4ab0
parent db3225c1264e1363262c210daa4a3c77a4fb6853

Use new cafile option in nova cinder options

ca_certificate_file is deprecated in favour of using the standard
options from keystoneclient session.

Change-Id: I611da719fb3a95d0a9c2f6ad43e2c083ea7d6862

lib/nova

diff --git a/lib/nova b/lib/nova
index 78906f7..32ab567 100644
--- a/lib/nova
+++ b/lib/nova
@@ -459,7 +459,7 @@
             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