[node-patches] Change in ovirt-node[master]: If miss custom netconsole port, using default netconsole por...

[hadong0720 at gmail.com]

hadong has uploaded a new change for review.

Change subject: If miss custom netconsole port, using default netconsole port "6666" to set
......................................................................

If miss custom netconsole port, using default netconsole port "6666" to set

primary rhevh only support netconsole=server:port to configure netconsole server
it also should support netconsole=server to configure netconsole server by using
default netconsole port "6666"
Now miss custom netconsole port, using default netconsole port "6666" to set

Change-Id: Iaf5d62200ae3a8307c2e06946ec5b9992180b581
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1104600
Signed-off-by: hadong <hadong at redhat.com>
---
M src/ovirtnode/log.py
1 file changed, 9 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/47/28347/1

diff --git a/src/ovirtnode/log.py b/src/ovirtnode/log.py
index 0aee5f6..f2280e6 100755
--- a/src/ovirtnode/log.py
+++ b/src/ovirtnode/log.py
@@ -180,7 +180,7 @@
 def netconsole_auto():
     host = ""
     port = ""
-    if (not "OVIRT_NETCONSOLE_SERVER" in _functions.OVIRT_VARS or not
+    if (not "OVIRT_NETCONSOLE_SERVER" in _functions.OVIRT_VARS and not
         "OVIRT_NETCONSOLE_PORT" in _functions.OVIRT_VARS):
         logger.info("Attempting to locate remote netconsole server...")
         try:
@@ -194,6 +194,14 @@
         else:
             logger.warn("Netconsole server not found!")
             return False
+    elif ("OVIRT_NETCONSOLE_SERVER" in _functions.OVIRT_VARS and not
+          "OVIRT_NETCONSOLE_PORT" in _functions.OVIRT_VARS):
+        logger.info("Using custom netconsole server and default port" +
+                    _functions.OVIRT_VARS["OVIRT_NETCONSOLE_SERVER"] + ":" +
+                    "6666" + ".")
+        ovirt_netconsole(_functions.OVIRT_VARS["OVIRT_NETCONSOLE_SERVER"],
+                         "6666")
+        return True
     else:
         logger.info("Using default netconsole server " +
                     _functions.OVIRT_VARS["OVIRT_NETCONSOLE_SERVER"] + ":" +


-- 
To view, visit http://gerrit.ovirt.org/28347
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iaf5d62200ae3a8307c2e06946ec5b9992180b581
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: hadong <hadong0720 at gmail.com>