From 55c7ebbdbaf97c8f1f22d8a06579edf836b503c6 Mon Sep 17 00:00:00 2001
From: Jamie Lennox <jamielennox@redhat.com>
Date: Tue, 25 Nov 2014 12:08:55 +1000
Subject: [PATCH] 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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/nova b/lib/nova
index 78906f7210..32ab567023 100644
--- a/lib/nova
+++ b/lib/nova
@@ -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