Merge "Build different etcd client depending protocol"

This commit is contained in:
Zuul 2019-07-27 01:19:18 +00:00 committed by Gerrit Code Review
commit 32a68d1bfc
1 changed files with 11 additions and 6 deletions

View File

@ -24,12 +24,17 @@ def get_client(conf=None):
conf = conf or CONF conf = conf or CONF
if not CLIENT: if not CLIENT:
CLIENT = etcd3gw.client(host=conf.etcd.host, if conf.etcd.protocol == "https":
port=conf.etcd.port, CLIENT = etcd3gw.client(host=conf.etcd.host,
protocol=conf.etcd.protocol, port=conf.etcd.port,
ca_cert=conf.etcd.ca_cert, protocol=conf.etcd.protocol,
cert_cert=conf.etcd.cert_file, ca_cert=conf.etcd.ca_cert,
cert_key=conf.etcd.cert_key) 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 return CLIENT