search for: vl_config

....2bd082e 100755 --- a/scripts/ovirt-config-networking +++ b/scripts/ovirt-config-networking @@ -45,6 +45,33 @@ function has_configured_interface fi } +# Configures vlan for the node. +# $1 - the nic +# $2 - the network bridge name +# $3 - the vlan id +# $4 - the VL_ROOT variable +# $5 - the VL_CONFIG variable +# $6 - the IF_ROOT value +# $7 - the vlan config filename variable +# $8 - the NIC config filename +function setup_vlan +{ + local nic=$1 + local bridge=$2 + local vlan_id=$3 + local vlroot=$4 + local vlconfig=$5 + local ifroot=$6 + local vlfilename=$7 + local iffi...

...ifcfg" + self.NTPCONF_FILE_ROOT="/files/etc/ntp" + self.NTP_CONFIG_FILE="/etc/ntp.conf" + self.NTPSERVERS="" + self.CONFIGURED_NIC= "" + self.IF_CONFIG = "" + self.BR_CONFIG = "" + self.VL_CONFIG = "" + self.VLAN_ID="" + self.VL_ROOT="" + self.VL_FILENAME ="" + self.nic="" + self.bridge="" + self.vlan_id="" + + def configure_interface(self): + log("Configuring Inter...

...s = open("/sys/class/net/" + self.CONFIGURED_NIC + "/address") nic_hwaddr = n_address.readline().strip("\n") n_address.close() @@ -112,10 +106,14 @@ class Network: if not OVIRT_VARS.has_key("OVIRT_IP_ADDRESS"): - if not self.VL_CONFIG: - self.IF_CONFIG += "set %s/BRIDGE %s\n" % (IF_ROOT, BRIDGE) - self.BR_CONFIG += "set %s/BOOTPROTO dhcp\n" % BR_ROOT - else: + if OVIRT_VARS.has_key("OVIRT_BOOTIF") and self.disabled_nic == 0: + if not self.VL_CONFIG...

...try: - oper, file = line.split() - augtool(oper, line, "") + oper, key = line.split() + augtool(oper, key, "") except: pass for line in self.VL_CONFIG.split("\n"): log(line) try: - oper, file, value = line.split() - augtool(oper, file, value) + oper, key, value = line.split() + augtool(oper, key, value) except: try: -...