[PATCH 2/6] use our ca/cert/keys specified in our overlord config

[Seth Vidal <skvidal@xxxxxxxxxxxxxxxxx>]

---
 func/overlord/client.py |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/func/overlord/client.py b/func/overlord/client.py
index b0631e7..7e0d8fa 100644
--- a/func/overlord/client.py
+++ b/func/overlord/client.py
@@ -496,6 +496,14 @@ class Overlord(object):
           # certmaster key, cert, ca
           # funcd key, cert, ca
           # raise FuncClientError
+        
+        if not client_key and self.overlord_config.key_file != '':
+            client_key = self.overlord_config.key_file
+        if not client_cert and self.overlord_config.cert_file != '':
+            client_cert = self.overlord_config.cert_file
+        if not ca and self.overlord_config.ca_file != '':
+            ca = self.overlord_config.ca_file
+            
         ol_key = '%s/certmaster.key' % self.cm_config.cadir
         ol_crt = '%s/certmaster.crt' % self.cm_config.cadir
         myname = func_utils.get_hostname_by_route()
-- 
1.6.6

_______________________________________________
Func-list mailing list
Func-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/func-list