Change in vdsm[master]: vdsm_config: move download certificate
Alon Bar-Lev
alonbl at redhat.com
Sun Apr 27 06:47:36 UTC 2014
Alon Bar-Lev has posted comments on this change.
Change subject: vdsm_config: move download certificate
......................................................................
Patch Set 18:
(4 comments)
http://gerrit.ovirt.org/#/c/26718/18/vdsm_reg/vdsm-reg-setup.in
File vdsm_reg/vdsm-reg-setup.in:
Line 208: fOKNow = False
Line 209: fOK = fOK and fOKNow
Line 210: logging.debug("execute: after getAuthKeysFile: %s", fOK)
Line 211:
Line 212: if fOK and self.cfg_fprint != "None":
here you bypass all download certificate if fingerprint is None, which is wrong.
Line 213: _, _, CACert = deployUtil.certPaths('')
Line 214:
Line 215: if os.path.exists(CACert):
Line 216: if self.cfg_fprint.upper() != \
Line 209: fOK = fOK and fOKNow
Line 210: logging.debug("execute: after getAuthKeysFile: %s", fOK)
Line 211:
Line 212: if fOK and self.cfg_fprint != "None":
Line 213: _, _, CACert = deployUtil.certPaths('')
this line can be moved to initialization, as it is passive, just initializing constant.
Line 214:
Line 215: if os.path.exists(CACert):
Line 216: if self.cfg_fprint.upper() != \
Line 217: deployUtil.generateFingerPrint(CACert):
Line 211:
Line 212: if fOK and self.cfg_fprint != "None":
Line 213: _, _, CACert = deployUtil.certPaths('')
Line 214:
Line 215: if os.path.exists(CACert):
then this condition is, removing the above code from this indent.
if fOK and os.path.exists(CACert) and self.cfg_fprint != "None":
Line 216: if self.cfg_fprint.upper() != \
Line 217: deployUtil.generateFingerPrint(CACert):
Line 218: ovirtfunctions.ovirt_safe_delete_config(CACert)
Line 219: os.remove(CACert)
Line 229: port=self.vdcPORT,
Line 230: output=file_tmp
Line 231: ):
Line 232: logging.error(
Line 233: "Cannot download Engine certificate file"
Cannot download Engine Web CA certificate
Line 234: )
Line 235: fOK = False
Line 236:
Line 237: if fOK:
--
To view, visit http://gerrit.ovirt.org/26718
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: comment
Gerrit-Change-Id: Ia2c025eedd2be92b9418ddbe01efc02c913af2a7
Gerrit-PatchSet: 18
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: Alon Bar-Lev <alonbl at redhat.com>
Gerrit-Reviewer: Dan Kenigsberg <danken at redhat.com>
Gerrit-Reviewer: Douglas Schilling Landgraf <dougsland at redhat.com>
Gerrit-Reviewer: automation at ovirt.org
Gerrit-Reviewer: oVirt Jenkins CI Server
Gerrit-HasComments: Yes
More information about the vdsm-patches
mailing list