Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolving build issues #746

Merged
merged 1 commit into from
Oct 4, 2017
Merged

Resolving build issues #746

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tendrl/commons/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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),
Expand Down
3 changes: 2 additions & 1 deletion tendrl/commons/flows/import_cluster/gluster_help.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down
3 changes: 2 additions & 1 deletion tendrl/commons/objects/cluster/atoms/configure_monitoring/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'],
Expand Down