Merge pull request #746 from rishubhjain/build_issues

Resolving build issues
Tendrl · Oct 4, 2017 · 6d5ffef · 6d5ffef
2 parents 22fac61 + a286478
commit 6d5ffef
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/tendrl/commons/__init__.py b/tendrl/commons/__init__.py
@@ -260,7 +260,7 @@ def setup_common_objects(self):
                 # setup etcd client with CA Cert and Client cert
                 NS._int.etcd_kwargs.update({"ca_cert" : self.current_ns.config.data['etcd_ca_cert_file'],
                                             "cert": (self.current_ns.config.data['etcd_cert_file'],
-                                                     self.current_ns.config.data['etcd_key_file'])
+                                                     self.current_ns.config.data['etcd_key_file']),
                                             "protocol":"https"})
 
             logger.log("debug", NS.get("publisher_id", None),

diff --git a/tendrl/commons/flows/import_cluster/gluster_help.py b/tendrl/commons/flows/import_cluster/gluster_help.py
@@ -101,7 +101,8 @@ def import_gluster(parameters):
     etcd_ca_cert_file = NS.config.data.get("etcd_ca_cert_file")
     etcd_cert_file = NS.config.data.get("etcd_cert_file")
     etcd_key_file = NS.config.data.get("etcd_key_file")
-    if etcd_ca_cert_file and str(etcd_ca_cert_file) != "" and etcd_cert_file and str(etcd_cert_file) != ""
+    if etcd_ca_cert_file and str(etcd_ca_cert_file) != "" \
+        and etcd_cert_file and str(etcd_cert_file) != "" \
         and etcd_key_file and str(etcd_key_file) != "":
         config_data.update({"etcd_ca_cert_file" : NS.config.data['etcd_ca_cert_file'],
                               "etcd_cert_file": NS.config.data['etcd_cert_file'],

diff --git a/tendrl/commons/objects/cluster/atoms/configure_monitoring/__init__.py b/tendrl/commons/objects/cluster/atoms/configure_monitoring/__init__.py
@@ -111,7 +111,8 @@ def run(self):
         etcd_ca_cert_file = NS.config.data.get("etcd_ca_cert_file")
         etcd_cert_file = NS.config.data.get("etcd_cert_file")
         etcd_key_file = NS.config.data.get("etcd_key_file")
-        if etcd_ca_cert_file and str(etcd_ca_cert_file) != "" and etcd_cert_file and str(etcd_cert_file) != ""
+        if etcd_ca_cert_file and str(etcd_ca_cert_file) != "" \
+            and etcd_cert_file and str(etcd_cert_file) != "" \
             and etcd_key_file and str(etcd_key_file) != "":
             plugin_params.update({"etcd_ca_cert_file" : NS.config.data['etcd_ca_cert_file'],
                                   "etcd_cert_file": NS.config.data['etcd_cert_file'],