[node-patches] Change in ovirt-node[master]: init: Add support for topology karg

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: init: Add support for topology karg
......................................................................

init: Add support for topology karg

Change-Id: I69c4d08531f724c5ae9e4f2350926baa1deb0e5b
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=971410
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M scripts/ovirt-init-functions.sh.in
1 file changed, 9 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/15/15615/1

diff --git a/scripts/ovirt-init-functions.sh.in b/scripts/ovirt-init-functions.sh.in
index a84e2d1..fc5e6f7 100644
--- a/scripts/ovirt-init-functions.sh.in
+++ b/scripts/ovirt-init-functions.sh.in
@@ -314,7 +314,7 @@
     #   dns=server[,server]
     #   ntp=server[,server]
     #   vlan=id
-    #   ssh_pwauth=[0|1]
+    #   topology=bridged|direct
     # static network configuration
     ip_address=
     ip_gateway=
@@ -325,7 +325,11 @@
     ipv6=
     dns=
     ntp=
+    topology=
+
+    #   ssh_pwauth=[0|1]
     ssh_pwauth=
+
     uninstall=
 
     # hostname=fqdn
@@ -601,6 +605,9 @@
             ntp=*)
             ntp=${i#ntp=}
             ;;
+            topology=*)
+            topology=${i#topology=}
+            ;;
             hostname=*)
             hostname=${i#hostname=}
             ;;
@@ -727,7 +734,7 @@
 
 
     # save boot parameters as defaults for ovirt-config-*
-    params="bootif init init_app vol_boot_size vol_efi_size vol_swap_size vol_root_size vol_config_size vol_logging_size vol_data_size vol_swap2_size vol_data2_size crypt_swap crypt_swap2 upgrade standalone overcommit ip_address ip_netmask ip_gateway ipv6 dns ntp vlan ssh_pwauth syslog_server syslog_port collectd_server collectd_port bootparams hostname firstboot runtime_mode kdump_nfs iscsi_name snmp_password install netconsole_server netconsole_port stateless cim_enabled wipe_fakeraid iscsi_init iscsi_target_name iscsi_target_host iscsi_target_port iscsi_install"
+    params="bootif init init_app vol_boot_size vol_efi_size vol_swap_size vol_root_size vol_config_size vol_logging_size vol_data_size vol_swap2_size vol_data2_size crypt_swap crypt_swap2 upgrade standalone overcommit ip_address ip_netmask ip_gateway ipv6 dns ntp vlan ssh_pwauth syslog_server syslog_port collectd_server collectd_port bootparams hostname firstboot runtime_mode kdump_nfs iscsi_name snmp_password install netconsole_server netconsole_port stateless cim_enabled wipe_fakeraid iscsi_init iscsi_target_name iscsi_target_host iscsi_target_port iscsi_install topology"
     # mount /config unless firstboot is forced
     if [ "$firstboot" != "1" ]; then
         mount_config


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I69c4d08531f724c5ae9e4f2350926baa1deb0e5b
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>