search for: net_configured

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

...orking | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/scripts/ovirt-config-networking b/scripts/ovirt-config-networking index cc7626b..837d493 100755 --- a/scripts/ovirt-config-networking +++ b/scripts/ovirt-config-networking @@ -515,5 +515,10 @@ stop_log if [ "$net_configured" = 1 ]; then service network stop > /dev/null 2>&1 + for i in `brctl show | grep breth | awk '{print $1}'` + do + ifconfig $i down + brctl delbr $i + done service network start fi -- 1.6.2.5

...RVERS"].split(":") + for server in SERVERS: + os.system("echo \"set /files/etc/ntp.conf/server[%s] %s\n\" >> %s") % (offset, server, ntpconf) + offset = offset + 1 + + def save_network_configuration(self): + net_configured=0 + augtool_workdir_list = "ls %s/augtool-* >/dev/null" + log("Configuring network") + + # delete existing scripts + try: + for vlan in os.listdir("/proc/net/vlan/"): + if "config" in vlan: +...

...offset = offset + 1 + os.system("service ntpd stop &> /dev/null") + os.system("service ntpdate start &> /dev/null") + os.system("service ntpd start &> /dev/null") def save_network_configuration(self): net_configured=0 @@ -255,10 +258,13 @@ class Network: for nic in self.CONFIGURED_NICS: ovirt_store_config("%s%s" % (self.IFSCRIPTS_PATH, nic) ) ovirt_store_config(self.NTP_CONFIG_FILE) + augtool("set", "/files/etc/sysconfig/network/NETWORKING", &...

..."Abort") rm -f "${WORKDIR}"/augtool-*; exit 99;; "Save & Exit") break 2;; *) if [[ -n "${NIC}" ]] && [[ "${NICS}" =~ "${NIC}" ]]; then @@ -287,6 +304,12 @@ start_log net_configured=0 if ls "$WORKDIR"/augtool-* > /dev/null 2>&1 ; then log "Configuring network" + + # delete existing scripts + for script in /etc/sysconfig/network-scripts/ifcfg-*; do + if [[ ! "${script}" =~ ifcfg-lo ]]; then rm -f $script; fi + done +...

...tf "\n\nManagement Network Configuration\n\n" >&2 printf "***** WARNING *****\n" printf "Configuring the network will destroy any existing networking\n" printf "configuration on this system.\n" @@ -351,4 +351,3 @@ if [ "$net_configured" = 1 ]; then service network stop > /dev/null 2>&1 service network start fi - -- 1.6.0.6

...NTPSERVERS="${NTPSERVERS}:${REPLY}" - else - printf "${REPLY} is an invalid address.\n" - fi + NTPSERVERS="${NTPSERVERS}:${REPLY}" done fi fi @@ -560,5 +555,9 @@ if [ "$net_configured" = 1 ]; then ifconfig $i down brctl delbr $i done - service network start + service network start 2> /dev/null + if [ $NTPSERVERS ]; then + log "Testing NTP Configuration" + test_ntp_configuration + fi fi diff --git a/scripts/ovirt-fun...

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