[NEW PATCH] BZ#719857 - Rhevh give user a warning before press the "reject" (via gerrit-bot)

Yotam Oron yoron at redhat.com
Mon Sep 5 13:04:14 UTC 2011


New patch submitted by Yotam Oron (yoron at redhat.com)

You can review this change at: http://gerrit.usersys.redhat.com/895

commit d1fd07952b13dbfc6901b821a4c9fb8b076dfac4
Author: Yotam Oron <yoron at redhat.com>
Date:   Mon Sep 5 16:05:16 2011 +0300

    BZ#719857 - Rhevh give user a warning before press the "reject"
    
    Instead of rebooting the host, fail the configuration and notify the user
    
    Change-Id: Id4d4b22f306c3ca67d8451def8654ffaaab1a8f7

diff --git a/vdsm_reg/rhevm.py b/vdsm_reg/rhevm.py
index 9335b61..d9cc627 100755
--- a/vdsm_reg/rhevm.py
+++ b/vdsm_reg/rhevm.py
@@ -152,13 +152,11 @@ class Plugin(PluginBase):
                     path, dontCare = deployUtil.certPaths('')
                     fp = deployUtil.generateFingerPrint(path)
                     approval = ButtonChoiceWindow(self.ncs.screen,
-                                "Certificate Fingerprint (Rejecting the finrgerprint will reboot the host):",
+                                "Certificate Fingerprint:",
                                 fp, buttons = ['Approve', 'Reject'])
                     if 'reject' == approval:
-                        out, err, rc = deployUtil._logExec(['/sbin/reboot'])
-                        if rc is not 0:
-                            log("Failed rebooting after fingerprint" + \
-                                "mismatch: %s", err)
+                        ButtonChoiceWindow(self.ncs.screen, "Fingerprint rejected", "RHEV-M Configuration Failed", buttons = ['Ok'])
+                        return False
                     else:
                         ovirt_store_config(path)
                         self.ncs.reset_screen_colors()




More information about the vdsm-patches mailing list