[NEW PATCH] BZ#732850 - Change defaults in RHEV-M registration dialog (via gerrit-bot)

Yotam Oron yoron at redhat.com
Thu Aug 25 13:30:10 UTC 2011


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

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

commit ce2376822ccec62919e1702edf569ed0a5984930
Author: Yotam Oron <yoron at redhat.com>
Date:   Thu Aug 25 16:31:09 2011 +0300

    BZ#732850 - Change defaults in RHEV-M registration dialog
    
    - Change default RHEVM port to 8443
    - Change verify checkbox wording
    
    Change-Id: I12da4420acc1d73cf6e08ca2df94d04397375d9e

diff --git a/vdsm_reg/rhevm.py b/vdsm_reg/rhevm.py
index b2c9191..da85f35 100755
--- a/vdsm_reg/rhevm.py
+++ b/vdsm_reg/rhevm.py
@@ -33,6 +33,7 @@ import deployUtil
 
 VDSM_CONFIG = "/etc/vdsm/vdsm.conf"
 VDSM_REG_CONFIG = "/etc/vdsm-reg/vdsm-reg.conf"
+VDC_HOST_PORT = 8443
 
 fWriteConfig = 0
 def set_defaults():
@@ -81,7 +82,7 @@ def write_vdsm_config(rhevm_host, rhevm_port):
 def get_rhevm_config():
     vdsm_config = open(VDSM_REG_CONFIG)
     config = {}
-    config["vdc_host_port"] = 443
+    config["vdc_host_port"] = VDC_HOST_PORT
     for line in vdsm_config:
         line = line.strip().replace(" ","").split("=")
         if "vdc_host_name" in line:
@@ -119,7 +120,7 @@ class Plugin(PluginBase):
         rhevm_grid.setField(self.rhevm_server, 1, 0, anchorLeft = 1, padding=(2, 0, 0, 1))
         rhevm_grid.setField(self.rhevm_server_port, 1, 1, anchorLeft = 1, padding=(2, 0, 0, 1))
         elements.setField(rhevm_grid, 0, 2, anchorLeft = 1, padding = (0,1,0,0))
-        self.verify_rhevm_cert = Checkbox("Verify RHEVM Certificate")
+        self.verify_rhevm_cert = Checkbox("Connect to RHEV Manager and Validate Certificate", isOn=True)
         elements.setField(self.verify_rhevm_cert, 0, 3, anchorLeft = 1, padding = (0,1,0,0))
 
         if not is_network_up:
diff --git a/vdsm_reg/vdsm-reg.conf.in b/vdsm_reg/vdsm-reg.conf.in
index f6942fc..7674d16 100644
--- a/vdsm_reg/vdsm-reg.conf.in
+++ b/vdsm_reg/vdsm-reg.conf.in
@@ -10,7 +10,7 @@ logger_conf=/etc/vdsm-reg/logger.conf
 #The hostname of the vdc, should be verified each boot (look for DNS SRV record)
 vdc_host_name=None
 #The port of the RHEV Manager. Allows http or https connections.
-vdc_host_port=443
+vdc_host_port=8443
 #The ssh file uri
 vdc_authkeys_path=/rhevm.ssh.key.txt
 #The registrtion uri




More information about the vdsm-patches mailing list