[node-patches] Change in ovirt-node[master]: set ip configuration correctly for iscsi root when using a b...

[jboggs at redhat.com]

Joey Boggs has uploaded a new change for review.

Change subject: set ip configuration correctly for iscsi root when using a bridge or not
......................................................................

set ip configuration correctly for iscsi root when using a bridge or not

rhbz#1019536

Change-Id: I0964f2dc8deda7b3d481e9cf103cf57c88faf8ba
Signed-off-by: Joey Boggs <jboggs at redhat.com>
---
M src/ovirtnode/install.py
1 file changed, 10 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/14/20214/1

diff --git a/src/ovirtnode/install.py b/src/ovirtnode/install.py
index f22ee4f..99b0ec4 100755
--- a/src/ovirtnode/install.py
+++ b/src/ovirtnode/install.py
@@ -483,13 +483,19 @@
         # reorder tty0 to allow both serial and phys console after installation
         if _functions.is_iscsi_install():
             self.root_param = "root=live:LABEL=Root"
-            self.bootparams = "netroot=iscsi:%s::%s::%s ip=br%s:dhcp bridge=br%s:%s " % (
+            if "OVIRT_NETWORK_LAYOUT" in OVIRT_VARS and \
+                OVIRT_VARS["OVIRT_NETWORK_LAYOUT"] == "bridged":
+                network_conf = "ip=br%s:dhcp bridge=br%s:%s" % \
+                                (OVIRT_VARS["OVIRT_BOOTIF"],
+                                 OVIRT_VARS["OVIRT_BOOTIF"],
+                                 OVIRT_VARS["OVIRT_BOOTIF"])
+            else:
+                network_conf = "ip=%s:dhcp" % OVIRT_VARS["OVIRT_BOOTIF"]
+            self.bootparams = "netroot=iscsi:%s::%s::%s %s " % (
                 OVIRT_VARS["OVIRT_ISCSI_TARGET_HOST"],
                 OVIRT_VARS["OVIRT_ISCSI_TARGET_PORT"],
                 OVIRT_VARS["OVIRT_ISCSI_TARGET_NAME"],
-                OVIRT_VARS["OVIRT_BOOTIF"],
-                OVIRT_VARS["OVIRT_BOOTIF"],
-                OVIRT_VARS["OVIRT_BOOTIF"])
+                network_conf)
             if "OVIRT_ISCSI_NAME" in OVIRT_VARS:
                 self.bootparams+= "rd.iscsi.initiator=%s " % \
                     OVIRT_VARS["OVIRT_ISCSI_NAME"]


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0964f2dc8deda7b3d481e9cf103cf57c88faf8ba
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Joey Boggs <jboggs at redhat.com>