# HG changeset patch
# User root@linux10
# Date 1223677816 0
# Node ID f7d6a94aa307cab02a887f0c885df0f974f0eddd
# Parent  748e008905796465871a8d362cbd4a960450d909
cleaning up

diff -r 748e00890579 -r f7d6a94aa307 INSTALL
--- a/INSTALL	Fri Oct 10 20:35:46 2008 +0000
+++ b/INSTALL	Fri Oct 10 22:30:16 2008 +0000
@@ -20,7 +20,6 @@
 chmod +x ${ROOT}/etc/init.d/xen-drbd
 
 cp xen-scripts-network-xen-drbd $ROOT/etc/xen/scripts/network-xen-drbd
-cp network-bridge-for-xen-drbd $ROOT/etc/xen/scripts/network-bridge-for-xen-drbd
 chmod +x /etc/xen/scripts/network-xen-drbd
 
 cp default-xen-drbd ${ROOT}/etc/default/xen-drbd
diff -r 748e00890579 -r f7d6a94aa307 config-example.py
--- a/config-example.py	Fri Oct 10 20:35:46 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-
-node1='dom0'
-node2='dom0m'
-i_am=node1
-
-ip_address = {
-	node1: '192.168.1.190',
-	node2: '192.168.1.191'
-}
-
-node1_ip=ip_address[node1]
-node2_ip=ip_address[node2]
-
-domains=['log', 'dns', 'gw', 'igw', 'ldap', 'mail', 'proxy', 'samba', 'vpn', 'intraweb', 'jabber'] 
-
-domain_home = {
-		node1 : ['log', 'dns', 'gw', 'igw', 'ldap', 'mail', 'proxy', 'vpn', 'intraweb', 'jabber'], 
-		node2 : ['samba'], 
-	}
-
-kernel = "/boot/vmlinuz-2.6.18-5-xen-686"
-ramdisk = "/boot/initrd.img-2.6.18-5-xen-686"
-
-mem_table={
-	'log'	:256, 
-	'dns'	:64, 
-	'gw' 	:64, 
-	'igw'	:128, 
-	'ldap'	:64, 
-	'mail'	:256, 
-	'proxy'	:256, 
-	'samba'	:256, 
-	'vpn'	:64,
-	'web'	:128,
-	'intraweb':128,
-	'jabber':64,
-}
-
-lvm_vg_name="XEN"
-disk_table={
-	'log'		: ['10G'], 
-	'dns'		: ['2G'], 
-	'gw' 		: ['2G'], 
-	'igw'		: ['2G'], 
-	'ldap'		: ['2G'], 
-	'mail'		: ['2G','maildir:2G'], 
-	'proxy'		: ['10G'], 
-	'samba'		: ['2G','samba-share:2G'],
-	'vpn'		: ['2G'],
-	'web'		: ['10G'],
-	'intraweb'	: ['10G'],
-	'jabber'	: ['2G'],
-}
-
-bridges=['br0','br1']
-vlans=[4094,4093]
-management_vlan=4094		# vlan 2
-trunk='eth1'
-management_ip=ip_address[i_am]
-management_gw='192.168.1.197'
-
-vbridges_table={
-	'log'		: ['br1'], 
-	'dns'		: ['br1'], 
-	'gw' 		: ['br0', 'br1'], 
-	'igw'		: ['br1'], 
-	'ldap'		: ['br1'], 
-	'mail'		: ['br1'], 
-	'proxy'		: ['br1'], 
-	'samba'		: ['br1'],
-	'vpn'		: ['br1'],
-	'web'		: ['br1'],
-	'intraweb'	: ['br1'],
-	'jabber'	: ['br1'],
-}
-
-ip_network="192.168.3"
-domain_name="example.com"
-ip_nameserver="192.168.3.2"
-ip_gateway="192.168.3.3"
-
-debian_release="etch"
-debian_mirror="http://debian.org.ua/debian"
-apt_get_install="less tcpdump libpam-ldap libnss-ldap snmpd libc6-xen openssh-server"
-
-
diff -r 748e00890579 -r f7d6a94aa307 config-example2.py
--- a/config-example2.py	Fri Oct 10 20:35:46 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,97 +0,0 @@
-
-node1='debian'
-node2='mirror'
-i_am=node1
-
-ip_address = {
-	node1: '10.0.1.19',
-	node2: '10.0.1.20',
-}
-
-node1_ip=ip_address[node1]
-node2_ip=ip_address[node2]
-
-domains=[ 'gw', 'igw', 'dns', 'vpn', 'apt' 'proxy', 'pgw', 'ldap', 'mail', 'uucp', 'samba', 'dozor', 'vvidd', ] 
-
-domain_home = {
-		node1 : ['dozor', 'dns', 'gw', 'igw', 'pgw', 'ldap', 'mail', 'proxy', 'vpn', 'uucp', 'vvidd', 'apt'], 
-		node2 : ['samba'], 
-	}
-
-kernel = "/boot/vmlinuz-2.6.18-4-xen-686"
-ramdisk = "/boot/initrd.img-2.6.18-4-xen-686-domU"
-
-mem_table={
-	'dozor'	:256, 
-	'dns'	:64, 
-	'gw' 	:64, 
-	'igw'	:128, 
-	'pgw' 	:64, 
-	'ldap'	:64, 
-	'mail'	:256, 
-	'proxy'	:256, 
-	'samba'	:512, 
-	'vpn'	:192,
-	'uucp'	:128,
-	'vvidd'	:64,
-	'apt'   :128,
-}
-
-lvm_vg_name="TURBO"
-disk_table={
-	'gw' 		: ['drbd1'], 
-	'igw'		: ['drbd2'], 
-	'dns'		: ['drbd3'], 
-	'vpn'		: ['drbd4'],
-	'apt'		: ['drbd5'],
-	'proxy'		: ['drbd6'], 
-	'pgw'		: ['drbd7'], 
-	'ldap'		: ['drbd8'], 
-	'mail'		: ['drbd10','drbd12:maildir'], 
-	'samba'		: [ 
-				'drbd18', 
-				'drbd13:samba-home', 
-				'drbd14:samba-nbumail', 
-				'drbd15:samba-arm3', 
-				'drbd16:samba-boxes', 
-				'drbd17:samba-profiles' 
-			  ],
-	'dozor'		: ['drbd19'], 
-	'vvidd'		: ['drbd20'], 
-}
-
-bridges=['tagged0', 'xenbr1', 'xenbr256', 'xenbr257', 'xenbr3', 'xenbr4', 'xenbr501']
-vlans=  ['tagged',        1,        256,        257,        3,        4,        501 ]
-management_vlan=1
-trunk='eth0'
-management_ip=ip_address[i_am]
-management_gw='10.0.1.253'
-
-vbridges_table={
-	'dozor'		: ['xenbr3'], 
-	'dns'		: ['xenbr3'], 
-	'gw' 		: ['xenbr501', 'xenbr256', 'xenbr257'], 
-	'igw'		: ['tagged0','xenbr3'], 
-	'pgw'		: ['xenbr3','xenbr501'], 
-	'ldap'		: ['xenbr3'], 
-	'mail'		: ['xenbr3'], 
-	'proxy'		: ['xenbr3'], 
-	'samba'		: ['tagged0', 'xenbr3'],
-	'vpn'		: ['xenbr3'],
-	'vvidd'		: ['xenbr3'],
-	'apt'		: ['xenbr3'],
-	'uucp'		: ['xenbr3'],
-}
-
-# FOR INSTALLATION ONLY
-
-ip_network="10.0.3"
-domain_name="eb.co.ua"
-ip_nameserver="10.0.3.4"
-ip_gateway="10.0.3.3"
-
-debian_release="etch"
-debian_mirror="http://debian.org.ua/debian"
-apt_get_install="less tcpdump libpam-ldap libnss-ldap snmpd libc6-xen openssh-server"
-
-
diff -r 748e00890579 -r f7d6a94aa307 eb.py
--- a/eb.py	Fri Oct 10 20:35:46 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-
-node1='debian'
-node2='mirror'
-i_am=node1
-
-ip_address = {
-	node1: '10.0.1.19',
-	node2: '10.0.1.20',
-}
-
-node1_ip=ip_address[node1]
-node2_ip=ip_address[node2]
-
-domains=[ 'gw', 'igw', 'dns', 'vpn', 'apt', 'proxy', 'pgw', 'ldap', 'mail', 'uucp', 'samba', 'dozor', 'vvidd', ] 
-
-domain_home = {
-		node1 : ['dozor', 'dns', 'gw', 'igw', 'pgw', 'ldap', 'mail', 'proxy', 'vpn', 'uucp', 'vvidd', 'apt'], 
-		node2 : ['samba'], 
-	}
-
-kernel = "/boot/vmlinuz-2.6.18-4-xen-686"
-ramdisk = "/boot/initrd.img-2.6.18-4-xen-686-domU"
-
-mem_table={
-	'dozor'	:256, 
-	'dns'	:64, 
-	'gw' 	:64, 
-	'igw'	:128, 
-	'pgw' 	:64, 
-	'ldap'	:64, 
-	'mail'	:256, 
-	'proxy'	:256, 
-	'samba'	:512, 
-	'vpn'	:192,
-	'uucp'	:128,
-	'vvidd'	:64,
-	'apt'   :128,
-}
-
-vcpus_table={
-	'dozor'	:4, 
-	'dns'	:2, 
-	'gw' 	:1, 
-	'igw'	:1, 
-	'pgw' 	:1, 
-	'ldap'	:1, 
-	'mail'	:4, 
-	'proxy'	:4, 
-	'samba'	:4, 
-	'vpn'	:4,
-	'uucp'	:4,
-	'vvidd'	:4,
-	'apt'   :2,
-}
-
-lvm_vg_name="TURBO"
-disk_table={
-	'gw' 		: ['drbd1'], 
-	'igw'		: ['drbd2'], 
-	'dns'		: ['drbd3=sda1'], 
-	'vpn'		: ['drbd4'],
-	'apt'		: ['drbd5'],
-	'proxy'		: ['drbd6'], 
-	'pgw'		: ['drbd7'], 
-	'ldap'		: ['drbd8'], 
-	'mail'		: ['drbd10','drbd12:maildir'], 
-	'uucp'		: ['drbd11'], 
-	'samba'		: [ 
-				'drbd18', 
-				'drbd13:samba-home', 
-				'drbd14:samba-nbumail', 
-				'drbd15:samba-arm3', 
-				'drbd16:samba-boxes', 
-				'drbd17:samba-profiles' 
-			  ],
-	'dozor'		: ['drbd19'], 
-	'vvidd'		: ['drbd20'], 
-}
-
-bridges=['tagged0', 'xenbr1', 'xenbr256', 'xenbr257', 'xenbr3', 'xenbr4', 'xenbr501']
-vlans=  ['tagged',        1,        256,        257,        3,        4,        501 ]
-management_vlan=1
-trunk='eth0'
-management_ip=ip_address[i_am]
-management_gw='10.0.1.253'
-
-vbridges_table={
-	'dozor'		: ['xenbr3'], 
-	'dns'		: ['xenbr3'], 
-	'gw' 		: ['xenbr501', 'xenbr256', 'xenbr257'], 
-	'igw'		: ['tagged0','xenbr3'], 
-	'pgw'		: ['xenbr3','xenbr501'], 
-	'ldap'		: ['xenbr3'], 
-	'mail'		: ['xenbr3'], 
-	'proxy'		: ['xenbr3'], 
-	'samba'		: ['tagged0', 'xenbr3'],
-	'vpn'		: ['xenbr3'],
-	'vvidd'		: ['xenbr3'],
-	'apt'		: ['xenbr3'],
-	'uucp'		: ['xenbr3'],
-}
-
-# FOR INSTALLATION ONLY
-
-ip_network="10.0.3"
-domain_name="eb.co.ua"
-ip_nameserver="10.0.3.4"
-ip_gateway="10.0.3.3"
-
-debian_release="etch"
-debian_mirror="http://debian.org.ua/debian"
-apt_get_install="less tcpdump libpam-ldap libnss-ldap snmpd libc6-xen openssh-server"
-
-
diff -r 748e00890579 -r f7d6a94aa307 examples/network1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/examples/network1	Fri Oct 10 22:30:16 2008 +0000
@@ -0,0 +1,99 @@
+
+node1='lab8'
+node2='linux10'
+
+from socket import gethostname; i_am=gethostname()
+if i_am != node1 and i_am != node2:
+    raise ValueError, "My hostname (%s) should be equal to node1 (%s) or node2 (%s)" % (i_am, node1, node2)
+
+ip_address = {
+	node1: '192.168.15.8',
+	node2: '192.168.15.10',
+}
+
+node1_ip=ip_address[node1]
+node2_ip=ip_address[node2]
+
+domains=	[ 'gw1',   'gw2',   'dns',   'mail',  'ts' ]
+domain_types=	[ 'linux', 'linux', 'linux', 'linux', 'linux' ]
+
+domain_home= {
+	node1 : ['gw1', 'gw2', 'dns'],
+	node2 : ['mail', 'ts'], 
+}
+
+kernel = "/boot/vmlinuz-2.6.18-6-xen-686"
+ramdisk = "/boot/initrd.img-2.6.18-6-xen-686"
+
+mem_table={
+	'gw1'	:256, 
+	'gw2'	:256, 
+	'dns' 	:256, 
+	'mail'	:256, 
+	'ts' 	:256, 
+}
+
+vcpus_table={
+	'gw1'	:1, 
+	'gw2'	:1, 
+	'dns' 	:1, 
+	'mail'	:1, 
+	'ts' 	:1, 
+}
+
+lvm_pv_names="/dev/null"
+lvm_vg_name="VG0"
+lvm_lv_drbd_meta_size="2G"
+lvm_lv_drbd_meta_name="meta"
+
+disk_table={
+	'gw1' 		: ['drbd1:gw1:2G'], 
+	'gw2' 		: ['drbd2:gw2:2G'], 
+	'dns' 		: ['drbd3:dns:2G'], 
+	'mail' 		: ['drbd4:mail:2G'], 
+	'ts' 		: ['drbd5:ts:5G'], 
+}
+
+bridges=['tagged0', 'br100', 'br1', 'br2', 'br3' ]
+vlans=  ['tagged',      100,  141,   142,   143  ]
+management_interface='br100'
+trunk='eth0'
+management_ip=ip_address[i_am]
+management_gw='192.168.15.254'
+management_netmask='255.255.255.0'
+
+vbridges_table={
+	'gw1' 		: ['br2','br3'], 
+	'gw2' 		: ['br2','br1'], 
+	'dns' 		: ['br2'], 
+	'mail' 		: ['br2'], 
+	'ts' 		: ['br1'], 
+}
+
+# FOR INSTALLATION ONLY
+
+ip_network="192.168.142"
+ip_netmask="255.255.255.0"
+domain_name="net4.unix.nt"
+ip_nameserver="192.168.142.2"
+ip_gateway="192.168.142.1"
+
+ip_address_table={
+	'gw1' 		: '192.168.142.1', 
+	'gw2' 		: '192.168.142.4',
+	'dns' 		: '192.168.142.2',
+	'mail' 		: '192.168.142.3', 
+	'ts' 		: '192.168.141.2', 
+}
+
+debian_release="sid"
+debian_mirror="http://10.0.35.1:9999/debian"
+apt_get_install="less tcpdump libc6-xen openssh host"
+
+apt_get_install_table={
+  "dns"   :"bind9 bind9utils",
+  "mail"  :"sendmail sensible-mda",
+  "ts"  :"xfce4 gdm vnc4server",
+}
+
+mkfs_options=""
diff -r 748e00890579 -r f7d6a94aa307 network-bridge-for-xen-drbd
--- a/network-bridge-for-xen-drbd	Fri Oct 10 20:35:46 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,313 +0,0 @@
-#!/bin/bash
-#============================================================================
-# Default Xen network start/stop script.
-# Xend calls a network script when it starts.
-# The script name to use is defined in /etc/xen/xend-config.sxp
-# in the network-script field.
-#
-# This script creates a bridge (default xenbr${vifnum}), adds a device
-# (default eth${vifnum}) to it, copies the IP addresses from the device
-# to the bridge and adjusts the routes accordingly.
-#
-# If all goes well, this should ensure that networking stays up.
-# However, some configurations are upset by this, especially
-# NFS roots. If the bridged setup does not meet your needs,
-# configure a different script, for example using routing instead.
-#
-# Usage:
-#
-# network-bridge (start|stop|status) {VAR=VAL}*
-#
-# Vars:
-#
-# vifnum     Virtual device number to use (default 0). Numbers >=8
-#            require the netback driver to have nloopbacks set to a
-#            higher value than its default of 8.
-# bridge     The bridge to use (default xenbr${vifnum}).
-# netdev     The interface to add to the bridge (default eth${vifnum}).
-# antispoof  Whether to use iptables to prevent spoofing (default no).
-#
-# Internal Vars:
-# pdev="p${netdev}"
-# vdev="veth${vifnum}"
-# vif0="vif0.${vifnum}"
-#
-# start:
-# Creates the bridge
-# Copies the IP and MAC addresses from netdev to vdev
-# Renames netdev to be pdev 
-# Renames vdev to be netdev 
-# Enslaves pdev, vdev to bridge
-#
-# stop:
-# Removes netdev from the bridge
-# Transfers addresses, routes from netdev to pdev
-# Renames netdev to vdev
-# Renames pdev to netdev 
-# Deletes bridge
-#
-# status:
-# Print addresses, interfaces, routes
-#
-#============================================================================
-
-
-dir=$(dirname "$0")
-. "$dir/xen-script-common.sh"
-. "$dir/xen-network-common.sh"
-
-findCommand "$@"
-evalVariables "$@"
-
-modprobe netloop > /dev/null 2>&1 || true
-
-vifnum=${vifnum:-$(ip route list | awk '/^default / { print $NF }' | sed 's/^[^0-9]*//')}
-vifnum=${vifnum:-0}
-bridge=${bridge:-xenbr${vifnum}}
-netdev=${netdev:-eth${vifnum}}
-antispoof=${antispoof:-no}
-
-pdev="p${netdev}"
-vdev="veth${vifnum}"
-vif0="vif0.${vifnum}"
-
-get_ip_info() {
-    addr_pfx=`ip addr show dev $1 | egrep '^ *inet' | sed -e 's/ *inet //' -e 's/ .*//'`
-    gateway=`ip route show dev $1 | fgrep default | sed 's/default via //'`
-}
-    
-do_ifup() {
-    if ! ifup $1 ; then
-        if [ ${addr_pfx} ] ; then
-            # use the info from get_ip_info()
-            ip addr flush $1
-            ip addr add ${addr_pfx} dev $1
-            ip link set dev $1 up
-            [ ${gateway} ] && ip route add default via ${gateway}
-        fi
-    fi
-}
-
-# Usage: transfer_addrs src dst
-# Copy all IP addresses (including aliases) from device $src to device $dst.
-transfer_addrs () {
-    local src=$1
-    local dst=$2
-    # Don't bother if $dst already has IP addresses.
-    if ip addr show dev ${dst} | egrep -q '^ *inet ' ; then
-        return
-    fi
-    # Address lines start with 'inet' and have the device in them.
-    # Replace 'inet' with 'ip addr add' and change the device name $src
-    # to 'dev $src'.
-    ip addr show dev ${src} | egrep '^ *inet ' | sed -e "
-s/inet/ip addr add/
-s@\([0-9]\+\.[0-9]\+\.[0-9]\+\.[0-9]\+/[0-9]\+\)@\1@
-s/${src}/dev ${dst}/
-" | sh -e
-    # Remove automatic routes on destination device
-    ip route list | sed -ne "
-/dev ${dst}\( \|$\)/ {
-  s/^/ip route del /
-  p
-}" | sh -e
-}
-
-# Usage: transfer_routes src dst
-# Get all IP routes to device $src, delete them, and
-# add the same routes to device $dst.
-# The original routes have to be deleted, otherwise adding them
-# for $dst fails (duplicate routes).
-transfer_routes () {
-    local src=$1
-    local dst=$2
-    # List all routes and grep the ones with $src in.
-    # Stick 'ip route del' on the front to delete.
-    # Change $src to $dst and use 'ip route add' to add.
-    ip route list | sed -ne "
-/dev ${src}\( \|$\)/ {
-  h
-  s/^/ip route del /
-  P
-  g
-  s/${src}/${dst}/
-  s/^/ip route add /
-  P
-  d
-}" | sh -e
-}
-
-
-##
-# link_exists interface
-#
-# Returns 0 if the interface named exists (whether up or down), 1 otherwise.
-#
-link_exists()
-{
-    if ip link show "$1" >/dev/null 2>/dev/null
-    then
-        return 0
-    else
-        return 1
-    fi
-}
-
-# Set the default forwarding policy for $dev to drop.
-# Allow forwarding to the bridge.
-antispoofing () {
-    iptables -P FORWARD DROP
-    iptables -F FORWARD
-    iptables -A FORWARD -m physdev --physdev-in ${pdev} -j ACCEPT
-    iptables -A FORWARD -m physdev --physdev-in ${vif0} -j ACCEPT
-}
-
-# Usage: show_status dev bridge
-# Print ifconfig and routes.
-show_status () {
-    local dev=$1
-    local bridge=$2
-    
-    echo '============================================================'
-    ip addr show ${dev}
-    ip addr show ${bridge}
-    echo ' '
-    brctl show ${bridge}
-    echo ' '
-    ip route list
-    echo ' '
-    route -n
-    echo '============================================================'
-}
-
-op_start () {
-    if [ "${bridge}" = "null" ] ; then
-	return
-    fi
-
-    if ! link_exists "$vdev"; then
-        if link_exists "$pdev"; then
-            # The device is already up.
-            return
-        else
-            echo "
-Link $vdev is missing.
-This may be because you have reached the limit of the number of interfaces
-that the loopback driver supports.  If the loopback driver is a module, you
-may raise this limit by passing it as a parameter (nloopbacks=<N>); if the
-driver is compiled statically into the kernel, then you may set the parameter
-using loopback.nloopbacks=<N> on the domain 0 kernel command line.
-" >&2
-            exit 1
-        fi
-    fi
-
-    create_bridge ${bridge}
-
-    if link_exists "$vdev"; then
-	mac=`ip link show ${netdev} | grep 'link\/ether' | sed -e 's/.*ether \(..:..:..:..:..:..\).*/\1/'`
-	preiftransfer ${netdev}
-	transfer_addrs ${netdev} ${vdev}
-	if ! ifdown ${netdev}; then
-	    # If ifdown fails, remember the IP details.
-	    get_ip_info ${netdev}
-	    ip link set ${netdev} down
-	    ip addr flush ${netdev}
-	fi
-	ip link set ${netdev} name ${pdev}
-	ip link set ${vdev} name ${netdev}
-
-	setup_bridge_port ${pdev}
-	setup_bridge_port ${vif0}
-	ip link set ${netdev} addr ${mac} arp on
-
-	ip link set ${bridge} up
-	add_to_bridge  ${bridge} ${vif0}
-	add_to_bridge2 ${bridge} ${pdev}
-	do_ifup ${netdev}
-    else
-	# old style without ${vdev}
-	transfer_addrs  ${netdev} ${bridge}
-	transfer_routes ${netdev} ${bridge}
-    fi
-
-    if [ ${antispoof} = 'yes' ] ; then
-	antispoofing
-    fi
-}
-
-op_stop () {
-    if [ "${bridge}" = "null" ]; then
-	return
-    fi
-    if ! link_exists "$bridge"; then
-	return
-    fi
-
-    if link_exists "$pdev"; then
-	ip link set dev ${vif0} down
-	mac=`ip link show ${netdev} | grep 'link\/ether' | sed -e 's/.*ether \(..:..:..:..:..:..\).*/\1/'`
-	transfer_addrs ${netdev} ${pdev}
-	if ! ifdown ${netdev}; then
-	    get_ip_info ${netdev}
-	fi
-	ip link set ${netdev} down arp off
-	ip link set ${netdev} addr fe:ff:ff:ff:ff:ff
-	ip link set ${pdev} down
-	ip addr flush ${netdev}
-	ip link set ${pdev} addr ${mac} arp on
-
-	brctl delif ${bridge} ${pdev}
-	brctl delif ${bridge} ${vif0}
-	ip link set ${bridge} down
-
-	ip link set ${netdev} name ${vdev}
-	ip link set ${pdev} name ${netdev}
-	do_ifup ${netdev}
-    else
-	transfer_routes ${bridge} ${netdev}
-	ip link set ${bridge} down
-    fi
-    brctl delbr ${bridge}
-}
-
-# adds $dev to $bridge but waits for $dev to be in running state first
-add_to_bridge2() {
-    local bridge=$1
-    local dev=$2
-    local maxtries=10
-
-    echo -n "Waiting for ${dev} to negotiate link."
-    ip link set ${dev} up
-    for i in `seq ${maxtries}` ; do
-	if ifconfig ${dev} | grep -q RUNNING ; then
-	    break
-	else
-	    echo -n '.'
-	    sleep 1
-	fi
-    done
-
-    if [ ${i} -eq ${maxtries} ] ; then echo '(link isnt in running state)' ; fi
-
-    add_to_bridge ${bridge} ${dev}
-}
-
-case "$command" in
-    start)
-	op_start
-	;;
-    
-    stop)
-	op_stop
-	;;
-
-    status)
-	show_status ${netdev} ${bridge}
-	;;
-
-    *)
-	echo "Unknown command: $command" >&2
-	echo 'Valid commands are: start, stop, status' >&2
-	exit 1
-esac
diff -r 748e00890579 -r f7d6a94aa307 od.py
--- a/od.py	Fri Oct 10 20:35:46 2008 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,134 +0,0 @@
-
-node1='manas'
-node2='mirror'
-#i_am=node1
-
-from socket import gethostname; i_am=gethostname()
-if i_am != node1 and i_am != node2:
-    raise ValueError, "My hostname (%s) should be equal to node1 (%s) or node2 (%s)" % (i_am, node1, node2)
-
-ip_address = {
-    node1: '10.0.5.220',
-    node2: '10.0.5.221',
-}
-
-node1_ip=ip_address[node1]
-node2_ip=ip_address[node2]
-
-domains=        [ 'gw',    'igw',   'dns',   'vpn',   'apt',   'pgw',   'ldap',  'mail', 'uucp',   'samba', 'test'] 
-domain_types=   [ 'linux', 'linux', 'linux', 'linux', 'linux', 'linux', 'linux', 'linux', 'linux', 'linux', 'hvm' ]
-
-domain_home = {
-        node1 : ['dns', 'gw', 'igw', 'pgw', 'ldap', 'mail', 'vpn', 'uucp', 'apt'], 
-        node2 : ['samba'], 
-    }
-
-kernel = "/boot/vmlinuz-2.6.18-5-xen-686"
-ramdisk = "/boot/initrd.img-2.6.18-5-xen-686"
-
-mem_table={
-    'dns'   :64,
-    'gw'    :64,
-    'igw'   :128,
-    'pgw'   :64,
-    'ldap'  :64,
-    'mail'  :256,
-    'samba' :512,
-    'vpn'   :192,
-    'uucp'  :128,
-    'apt'   :128,
-    'test'   :128,
-}
-
-vcpus_table={
-    'dns'   :1,
-    'gw'    :1,
-    'igw'   :1,
-    'pgw'   :1,
-    'ldap'  :1,
-    'mail'  :4,
-    'samba' :4,
-    'vpn'   :4,
-    'uucp'  :4,
-    'apt'   :2,
-    'test'   :2,
-}
-
-lvm_vg_name="TURBO"
-lvm_pv_names="/dev/md2"
-lvm_lv_drbd_meta_name="meta"
-lvm_lv_drbd_meta_size="5G"
-mkfs_options="-m1"
-
-disk_table={
-    'gw'        : ['drbd1:gw:2G'], 
-    'igw'       : ['drbd2:igw:2G'], 
-    'dns'       : ['drbd3=sda1:dns:2G'], 
-    'vpn'       : ['drbd4:vpn:2G'],
-    'apt'       : ['drbd5:apt:10G'],
-    'pgw'       : ['drbd6:pgw:2G'],
-    'ldap'      : ['drbd7:ldap:2G'], 
-    'mail'      : ['drbd8:mail:2G','drbd9:maildir:100G'], 
-    'uucp'      : ['drbd11:uucp:3G'], 
-    'samba'     : [ 
-                'drbd12:samba:3G', 
-                'drbd13:samba-home:100G', 
-                'drbd14:samba-nbumail:100G', 
-                'drbd17:samba-profiles:100G' 
-              ],
-    'test'      : ['drbd18:test:3G'], 
-}
-
-bridges=['tagged0', 'xenbr1', 'xenbr256', 'xenbr257', 'xenbr3', 'xenbr4', 'xenbr501']
-vlans=  ['tagged',        1,        256,        257,        3,        4,        501 ]
-management_vlan=1
-trunk='eth0'
-management_ip=ip_address[i_am]
-management_gw='10.0.5.253'
-management_netmask='255.255.255.0'
-
-vbridges_table={
-    'dns'       : ['xenbr3'], 
-    'gw'        : ['xenbr501', 'xenbr256', 'xenbr257'], 
-    'igw'       : ['tagged0','xenbr3'], 
-    'pgw'       : ['xenbr3','xenbr501'], 
-    'ldap'      : ['xenbr3'], 
-    'mail'      : ['xenbr3'], 
-    'samba'     : ['tagged0', 'xenbr3'],
-    'vpn'       : ['xenbr3'],
-    'apt'       : ['xenbr3'],
-    'uucp'      : ['xenbr3'],
-    'test'      : ['xenbr3'],
-}
-
-# FOR INSTALLATION ONLY
-
-ip_network="10.4.3"
-ip_netmask="255.255.255.224"
-domain_name="od.eb.co.ua"
-ip_nameserver="10.4.3.4"
-ip_gateway="10.4.3.6"
-
-ip_address_table={
-    "dns"   :"10.4.3.4",
-    "gw"    :"10.4.3.254",
-    "igw"   :"10.4.3.3",
-    "pgw"   :"10.4.3.6",
-    "ldap"  :"10.4.3.11",
-    "mail"  :"10.4.3.9",
-    "samba" :"10.4.3.1",
-    "vpn"   :"10.4.3.5",
-    "apt"   :"10.4.3.7",
-    "uucp"  :"10.4.3.16",
-    "jabber":"10.4.3.12",
-
-}
-
-debian_release="lenny"
-debian_mirror="http://apt.eb.co.ua:9999/debian"
-apt_get_install="less tcpdump dnsutils vim ntp screen snmpd libc6-xen openssh-server"
-
-apt_get_install_table={
-    "vpn"   :"openvpn",
-}
-