[root@kicker snippets]# diff -c pre_install_network_config pre_install_network_config.orig
*** pre_install_network_config 2015-05-31 21:13:18.298305070 -0700
--- pre_install_network_config.orig 2015-05-31 21:13:01.372426891 -0700
***************
*** 30,36 ****
}
#end raw
#set ikeys = $interfaces.keys()
! #import re
#set $vlanpattern = $re.compile("[a-zA-Z0-9]+[\.][0-9]+")
#set $routepattern = $re.compile("[0-9/.]+:[0-9.]+")
##
--- 30,36 ----
}
#end raw
#set ikeys = $interfaces.keys()
! # import re
#set $vlanpattern = $re.compile("[a-zA-Z0-9]+[\.][0-9]+")
#set $routepattern = $re.compile("[0-9/.]+:[0-9.]+")
##
***************
*** 56,61 ****
--- 56,63 ----
#set $static = $idata["static"]
#set $ip = $idata["ip_address"]
#set $netmask = $idata["netmask"]
+ #set $gateway = $idata["gateway"]
+ #set $if_gateway = $idata["if_gateway"]
#set $iface_type = $idata["interface_type"]
#set $iface_master = $idata["interface_master"]
#set $static_routes = $idata["static_routes"]
***************
*** 101,108 ****
#set $netmask = "255.255.255.0"
#end if
#set $netinfo = "--bootproto=static --ip=%s --netmask=%s" % ($ip, $netmask)
! #if $gateway != ""
! #set $netinfo = "%s --gateway=%s" % ($netinfo, $gateway)
#end if
#if $len($name_servers) > 0
#set $netinfo = "%s --nameserver=%s" % ($netinfo, $name_servers[0])
--- 103,116 ----
#set $netmask = "255.255.255.0"
#end if
#set $netinfo = "--bootproto=static --ip=%s --netmask=%s" % ($ip, $netmask)
! #if $if_gateway != ""
! #if $if_gateway == $gateway
! #set $netinfo = "%s --gateway=%s" % ($netinfo, $if_gateway)
! #else
! #set $netinfo = "%s --gateway=%s --nodefroute" % ($netinfo, $if_gateway)
! #end if
! #else if $gateway != ""
! #set $netinfo = "%s --gateway=%s" % ($netinfo, $gateway)
#end if
#if $len($name_servers) > 0
#set $netinfo = "%s --nameserver=%s" % ($netinfo, $name_servers[0])