search for: br_root

...@@ -160,56 +160,66 @@ function configure_interface return;; esac - read -ep "Enable IPv4 support ([S]tatic IP, [D]HCP, [N]o or [A]bort)? " - case $REPLY in - D|d) - BR_CONFIG="$BR_CONFIG\nset $BR_ROOT/BOOTPROTO dhcp" - ;; - S|s) - printf "\n" - read -ep "IP Address: "; IPADDR=$REPLY - read -ep " Netmask: "; NETMASK=$REPLY - read -ep " Gateway:...

...15 +++++++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/scripts/network.py b/scripts/network.py index fd78877..8159283 100644 --- a/scripts/network.py +++ b/scripts/network.py @@ -78,7 +78,6 @@ class Network: self.BR_CONFIG += "set %s/TYPE Bridge\n" % BR_ROOT self.BR_CONFIG += "set %s/PEERNTP yes\n" % BR_ROOT self.BR_CONFIG += "set %s/DELAY 0\n" % BR_ROOT - if OVIRT_VARS.has_key("OVIRT_IPV6"): if OVIRT_VARS["OVIRT_IPV6"] == "auto": self.BR_CONFIG...

...quot;/augtool-" + BRIDGE + log("\nConfigure $BRIDGE for use by $NIC..\n\n") + IF_ROOT = "%s-%s" % (self.IFCONFIG_FILE_ROOT, self.CONFIGURED_NIC) + self.IF_CONFIG += "rm %s\nset %s/DEVICE %s\n" % (IF_ROOT, IF_ROOT, self.CONFIGURED_NIC) + BR_ROOT = "%s-%s" % (self.IFCONFIG_FILE_ROOT, BRIDGE) + self.BR_CONFIG += "rm %s\nset %s/DEVICE %s\n" % (BR_ROOT, BR_ROOT, BRIDGE) + self.BR_CONFIG += "set %s/TYPE Bridge\n" % BR_ROOT + self.BR_CONFIG += "set %s/PEERNTP yes\n" % BR_ROOT + +...

...+++------ 3 files changed, 54 insertions(+), 17 deletions(-) diff --git a/scripts/network.py b/scripts/network.py index ccc4bd8..f51ee7c 100644 --- a/scripts/network.py +++ b/scripts/network.py @@ -85,9 +85,10 @@ class Network: self.BR_CONFIG += "set %s/DHCPV6C yes\n" % BR_ROOT elif OVIRT_VARS["OVIRT_IPV6"] == "static": self.BR_CONFIG += "set %s/IPV6INIT yes\n" % BR_ROOT - self.BR_CONFIG += "set %s/IPV6ADDR %s\n" % (BR_ROOT, OVIRT_VARS["OVIRT_IPV6_ADDRESS"]) + sel...

...,10 @@ function configure_interface printf "\nConfigure $BRIDGE for use by $NIC..\n\n" - local IF_ROOT="$CONFIG_FILE_ROOT-$NIC" + local IF_ROOT="$IFCONFIG_FILE_ROOT-$NIC" local IF_CONFIG="rm $IF_ROOT\nset $IF_ROOT/DEVICE $NIC" - local BR_ROOT="$CONFIG_FILE_ROOT-$BRIDGE" + local BR_ROOT="$IFCONFIG_FILE_ROOT-$BRIDGE" local BR_CONFIG="rm $BR_ROOT\nset $BR_ROOT/DEVICE $BRIDGE" BR_CONFIG="$BR_CONFIG\nset $BR_ROOT/TYPE Bridge" BR_CONFIG="$BR_CONFIG\nset $BR_ROOT/PEERNTP yes"...

...+-------- 3 files changed, 53 insertions(+), 18 deletions(-) diff --git a/scripts/network.py b/scripts/network.py index ccc4bd8..f51ee7c 100644 --- a/scripts/network.py +++ b/scripts/network.py @@ -85,9 +85,10 @@ class Network: self.BR_CONFIG += "set %s/DHCPV6C yes\n" % BR_ROOT elif OVIRT_VARS["OVIRT_IPV6"] == "static": self.BR_CONFIG += "set %s/IPV6INIT yes\n" % BR_ROOT - self.BR_CONFIG += "set %s/IPV6ADDR %s\n" % (BR_ROOT, OVIRT_VARS["OVIRT_IPV6_ADDRESS"]) + sel...

...=$OVIRT_VLAN + setup_vlan $NIC $BRIDGE $VLAN_ID VL_ROOT VL_CONFIG $IF_ROOT VL_FILENAME $IF_FILENAME + fi + if [ -z "$OVIRT_IP_ADDRESS" ]; then - IF_CONFIG="${IF_CONFIG}\nset ${IF_ROOT}/BRIDGE ${BRIDGE}" - BR_CONFIG="$BR_CONFIG\nset $BR_ROOT/BOOTPROTO dhcp" + if [ -z "$VL_CONFIG" ]; then + IF_CONFIG="${IF_CONFIG}\nset ${IF_ROOT}/BRIDGE ${BRIDGE}" + fi + BR_CONFIG="$BR_CONFIG\nset $BR_ROOT/BOOTPROTO dhcp" else if [ "$OVIRT_IP_ADDRESS" != "off" ]; t...

This patch obsoletes the previously submitted patch. It adds a warning message to the user when they select to change the NTP settings.

parse input augtool strings to oper,key,value --- scripts/network.py | 32 ++++++++++++++++---------------- 1 files changed, 16 insertions(+), 16 deletions(-) diff --git a/scripts/network.py b/scripts/network.py index f51ee7c..65b551c 100644 --- a/scripts/network.py +++ b/scripts/network.py @@ -165,11 +165,11 @@ class Network: ntpconf = ntpconf.split("\n") for line

...+ + rm -rf $WORKDIR/* + CONFIGURED_NIC=$NIC + local BRIDGE=br$NIC local IF_FILENAME="$WORKDIR/augtool-$NIC" local BR_FILENAME="$WORKDIR/augtool-$BRIDGE" @@ -69,7 +81,7 @@ function configure_interface BR_CONFIG="$BR_CONFIG\nset $BR_ROOT/GATEWAY $GATEWAY" fi ;; - A|a) return ;; + A|a) CONFIGURED_NIC=""; return ;; esac printf "\n" @@ -91,7 +103,7 @@ function configure_interface BR_CONFIG=&...

...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: + self.IF_CONFIG += "set %s/BRIDGE %s\n" % (IF_ROOT, BRIDGE) + self.BR_CONFIG += "set %s/BOOTPROTO dhcp\n" %...

...ateway: "; GATEWAY=$REPLY + input_ipv4_address IPADDR "IP Address" + input_ipv4_address NETMASK " Netmask" + input_ipv4_address GATEWAY " Gateway" BR_CONFIG="$BR_CONFIG\nset $BR_ROOT/BOOTPROTO none" BR_CONFIG="$BR_CONFIG\nset $BR_ROOT/IPADDR $IPADDR" -- 1.6.2.5

This version of the patch was rebased to go on top of recent changes committed to ovirt-config-networking on next.

This is a repost of patches for ovirt-config-* ACK to all. Pushed.

...esac printf "\n" - read -ep "Is this correct (Y/N/A)? " - case $REPLY in - Y|y) - IF_CONFIG="$IF_CONFIG\nset $IF_ROOT/ONBOOT yes" - BR_CONFIG="$BR_CONFIG\nset $BR_ROOT/ONBOOT yes" - - printf "$IF_CONFIG\n" > $IF_FILENAME - printf "$BR_CONFIG\n" > $BR_FILENAME - break + ask_yes_or_no "Is this correct (y/n/a)?" + case $? in +...