Juan Hernandez has uploaded a new change for review. Change subject: Don't require fingerprint ......................................................................
Don't require fingerprint Currently, during automated installation of the node, we require the user to provide the fingerprint of the CA certificate in the "management_server_fingerprint" kernel option. This should be optinal, so if it is not provided then nothing is checked. Change-Id: Ie0375ce95ee12cf20cc968bccc47e324eae0a856 Bug-Url: https://bugzilla.redhat.com/856167 Signed-off-by: Juan Hernandez <[email protected]> --- M vdsm_reg/deployUtil.py.in 1 file changed, 7 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/47/8647/1 diff --git a/vdsm_reg/deployUtil.py.in b/vdsm_reg/deployUtil.py.in index cd41028..dec03c2 100644 --- a/vdsm_reg/deployUtil.py.in +++ b/vdsm_reg/deployUtil.py.in @@ -1663,19 +1663,18 @@ print 'Node clean-up successful' return 0 if options.downloadRhevmCert: - if not options.serverIp or not options.serverPort or \ - not options.fingerPrint: - print "Must supply @ENGINENAME@'s IP, port and a fingerprint to " + \ - "verify against" + if not options.serverIp or not options.serverPort: + print "Must supply @ENGINENAME@'s IP and port" return -1 if not getRhevmCert(options.serverIp, options.serverPort): print 'Failed downloading the @ENGINENAME@ certificate file' return -1 _, _, engineWebCACert = certPaths('') - fp = generateFingerPrint(engineWebCACert) - if options.fingerPrint != fp: - print 'Expected fingerprint %s is different from recieved fingerprint %s' % (options.fingerPrint, fp) - return -1 + if options.fingerPrint: + fp = generateFingerPrint(engineWebCACert) + if options.fingerPrint != fp: + print 'Expected fingerprint %s is different from recieved fingerprint %s' % (options.fingerPrint, fp) + return -1 if isOvirt(): ovirtfunctions.ovirt_store_config(engineWebCACert) -- To view, visit http://gerrit.ovirt.org/8647 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie0375ce95ee12cf20cc968bccc47e324eae0a856 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Juan Hernandez <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
