From adba9605aca5db80d71d1ec9e14b152ff19c4139 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ga=C3=ABtan=20Trellu?= Date: Fri, 21 Jun 2019 17:31:27 -0400 Subject: [PATCH] Build different etcd client depending protocol etcd should not looking for TLS certificates when http protocol is used. Change-Id: I91122cc56bf1f11be1700d09ff03cdff15badf91 Story: 2005935 Task: 34281 --- qinling/utils/etcd_util.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/qinling/utils/etcd_util.py b/qinling/utils/etcd_util.py index 586e4592..82fa635e 100644 --- a/qinling/utils/etcd_util.py +++ b/qinling/utils/etcd_util.py @@ -24,12 +24,17 @@ def get_client(conf=None): conf = conf or CONF if not CLIENT: - CLIENT = etcd3gw.client(host=conf.etcd.host, - port=conf.etcd.port, - protocol=conf.etcd.protocol, - ca_cert=conf.etcd.ca_cert, - cert_cert=conf.etcd.cert_file, - cert_key=conf.etcd.cert_key) + if conf.etcd.protocol == "https": + CLIENT = etcd3gw.client(host=conf.etcd.host, + port=conf.etcd.port, + protocol=conf.etcd.protocol, + ca_cert=conf.etcd.ca_cert, + cert_cert=conf.etcd.cert_file, + cert_key=conf.etcd.cert_key) + else: + CLIENT = etcd3gw.client(host=conf.etcd.host, + port=conf.etcd.port, + protocol=conf.etcd.protocol) return CLIENT