From 8097b7b423303f47d38fa9ae70373b153d40a031 Mon Sep 17 00:00:00 2001 From: Sergey Lukjanov Date: Wed, 7 Jan 2015 17:22:22 +0300 Subject: [PATCH] Add ssl support for sahara client Add support for insecure and ca_file options when creating Sahara client. Depends on client release with the following change request merged: Id2c80a6031ca269b1fd864caf46bd75a85a6637a Change-Id: I2bc32eb7a9dc7fa23d0839a43d333ec01d1bf28f --- heat/engine/clients/os/sahara.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/heat/engine/clients/os/sahara.py b/heat/engine/clients/os/sahara.py index d79f14920f..3ea6eb0485 100644 --- a/heat/engine/clients/os/sahara.py +++ b/heat/engine/clients/os/sahara.py @@ -33,7 +33,9 @@ class SaharaClientPlugin(client_plugin.ClientPlugin): 'input_auth_token': self.auth_token, 'auth_url': con.auth_url, 'project_name': con.tenant, - 'sahara_url': endpoint + 'sahara_url': endpoint, + 'insecure': self._get_client_option('sahara', 'insecure'), + 'cacert': self._get_client_option('sahara', 'ca_file') } client = sahara_client.Client('1.1', **args) return client