From fa7fd9d9882baf028efe0807840a4a8180cc9b9c Mon Sep 17 00:00:00 2001 From: ZHU ZHU Date: Thu, 23 Oct 2014 06:45:38 -0500 Subject: [PATCH] Correct CA cert argument for glanceclient Heat need to pass the CA cert to glanceclient to load image data during stack creation when glance api is configured with SSL. Currently the client is passing the wrong cert key to glanceclient. The key should be 'cacert' instead of 'ca_file'. Change-Id: Ie542dda1354776e62507240c917c1cffbc222f17 Closes-Bug: #1384626 --- heat/engine/clients/os/glance.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/heat/engine/clients/os/glance.py b/heat/engine/clients/os/glance.py index 49c6e1b8d..47bcf63b0 100644 --- a/heat/engine/clients/os/glance.py +++ b/heat/engine/clients/os/glance.py @@ -41,7 +41,7 @@ class GlanceClientPlugin(client_plugin.ClientPlugin): 'project_id': con.tenant, 'token': self.auth_token, 'endpoint_type': endpoint_type, - 'ca_file': self._get_client_option('glance', 'ca_file'), + 'cacert': self._get_client_option('glance', 'ca_file'), 'cert_file': self._get_client_option('glance', 'cert_file'), 'key_file': self._get_client_option('glance', 'key_file'), 'insecure': self._get_client_option('glance', 'insecure')