Simone Tiraboschi has uploaded a new change for review. Change subject: ovirt-image-uploader: fixing usage of API SDK insecure parameter ......................................................................
ovirt-image-uploader: fixing usage of API SDK insecure parameter Python SDK insecure parameter simply skips hostname validation, it still gives errors if we also pass an unmatching CA cert. Change-Id: I02f96fb2053c543e1c54dc84921da75823282509 Bug-Url: https://bugzilla.redhat.com/1136434 Signed-off-by: Simone Tiraboschi <[email protected]> (cherry picked from commit 956d1d3e4c839bccbdbfe027daa212bf39f92957) --- M src/__main__.py 1 file changed, 16 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-image-uploader refs/changes/55/32355/1 diff --git a/src/__main__.py b/src/__main__.py index 0200340..7697238 100644 --- a/src/__main__.py +++ b/src/__main__.py @@ -438,13 +438,20 @@ try: # If "insecure" option was provided, use it during API creation - self.api = API( - url=url, - username=self.configuration.get("user"), - password=self.configuration.get("passwd"), - ca_file=self.configuration.get("cert_file"), - insecure=self.configuration.get("insecure"), - ) + if self.configuration.get("insecure"): + self.api = API( + url=url, + username=self.configuration.get("user"), + password=self.configuration.get("passwd"), + insecure=True, + ) + else: + self.api = API( + url=url, + username=self.configuration.get("user"), + password=self.configuration.get("passwd"), + ca_file=self.configuration.get("cert_file"), + ) pi = self.api.get_product_info() if pi is not None: @@ -501,7 +508,7 @@ return ary[0] if not self._initialize_api(): - return + sys.exit(ExitCodes.CRITICAL) dcAry = self.api.datacenters.list() if dcAry is not None: @@ -544,7 +551,7 @@ (host, id, path) """ if not self._initialize_api(): - return + sys.exit(ExitCodes.CRITICAL) sd = self.api.storagedomains.get(exportdomain) if sd is not None: if sd.get_type() != 'export': -- To view, visit http://gerrit.ovirt.org/32355 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I02f96fb2053c543e1c54dc84921da75823282509 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-image-uploader Gerrit-Branch: ovirt-image-uploader-3.4 Gerrit-Owner: Simone Tiraboschi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
