From e44ce6ed7fd1f4083fab5aa75e452d3cccd28eea Mon Sep 17 00:00:00 2001 From: Trinh Nguyen Date: Wed, 21 Feb 2018 21:08:51 +0900 Subject: [PATCH] Do not have to mention ssl_ca_cert in vim config file (server) This patch along with another patch on the tacker client will remove the need to mention ssl_ca_cert in the vim configuration file. Tacker client patch: https://review.openstack.org/546578 Change-Id: I362c40e8b2a606e3b28d368a95e74ee5ea306241 --- tacker/nfvo/drivers/vim/kubernetes_driver.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tacker/nfvo/drivers/vim/kubernetes_driver.py b/tacker/nfvo/drivers/vim/kubernetes_driver.py index 54a96c899..935abb351 100644 --- a/tacker/nfvo/drivers/vim/kubernetes_driver.py +++ b/tacker/nfvo/drivers/vim/kubernetes_driver.py @@ -74,8 +74,8 @@ class Kubernetes_Driver(abstract_vim_driver.VimAbstractDriver): return auth_cred, file_descriptor def _create_ssl_ca_file(self, auth_cred): - ca_cert = auth_cred['ssl_ca_cert'] - if ca_cert is not None: + if auth_cred.get('ssl_ca_cert', ''): + ca_cert = auth_cred['ssl_ca_cert'] file_descriptor, file_path = \ self.kubernetes.create_ca_cert_tmp_file(ca_cert) auth_cred['ca_cert_file'] = file_path @@ -189,7 +189,7 @@ class Kubernetes_Driver(abstract_vim_driver.VimAbstractDriver): encoded_auth = fernet_obj.encrypt( auth['bearer_token'].encode('utf-8')) auth['bearer_token'] = encoded_auth - if ('ssl_ca_cert' in auth) and (auth['ssl_ca_cert'] is not None): + if auth.get('ssl_ca_cert', ''): encoded_auth = fernet_obj.encrypt( auth['ssl_ca_cert'].encode('utf-8')) auth['ssl_ca_cert'] = encoded_auth