1.1 --- a/od.py	Mon Feb 11 17:08:54 2008 +0200
     1.2 +++ b/od.py	Mon Feb 11 19:56:57 2008 +0200
     1.3 @@ -4,77 +4,66 @@
     1.4  i_am=node1
     1.5  
     1.6  ip_address = {
     1.7 -	node1: '10.0.1.19',
     1.8 -	node2: '10.0.1.20',
     1.9 +    node1: '10.0.5.220',
    1.10 +    node2: '10.0.5.221',
    1.11  }
    1.12  
    1.13  node1_ip=ip_address[node1]
    1.14  node2_ip=ip_address[node2]
    1.15  
    1.16 -domains=[ 'gw', 'igw', 'dns', 'vpn', 'apt', 'proxy', 'pgw', 'ldap', 'mail', 'uucp', 'samba', 'dozor', 'vvidd', ] 
    1.17 +domains=[ 'gw', 'igw', 'dns', 'vpn', 'apt', 'pgw', 'ldap', 'mail', 'uucp', 'samba', ] 
    1.18  
    1.19  domain_home = {
    1.20 -		node1 : ['dozor', 'dns', 'gw', 'igw', 'pgw', 'ldap', 'mail', 'proxy', 'vpn', 'uucp', 'vvidd', 'apt'], 
    1.21 -		node2 : ['samba'], 
    1.22 -	}
    1.23 +        node1 : ['dns', 'gw', 'igw', 'pgw', 'ldap', 'mail', 'vpn', 'uucp', 'apt'], 
    1.24 +        node2 : ['samba'], 
    1.25 +    }
    1.26  
    1.27  kernel = "/boot/vmlinuz-2.6.18-4-xen-686"
    1.28  ramdisk = "/boot/initrd.img-2.6.18-4-xen-686-domU"
    1.29  
    1.30  mem_table={
    1.31 -	'dozor'	:256, 
    1.32 -	'dns'	:64, 
    1.33 -	'gw' 	:64, 
    1.34 -	'igw'	:128, 
    1.35 -	'pgw' 	:64, 
    1.36 -	'ldap'	:64, 
    1.37 -	'mail'	:256, 
    1.38 -	'proxy'	:256, 
    1.39 -	'samba'	:512, 
    1.40 -	'vpn'	:192,
    1.41 -	'uucp'	:128,
    1.42 -	'vvidd'	:64,
    1.43 -	'apt'   :128,
    1.44 +    'dns'   :64,
    1.45 +    'gw'    :64,
    1.46 +    'igw'   :128,
    1.47 +    'pgw'   :64,
    1.48 +    'ldap'  :64,
    1.49 +    'mail'  :256,
    1.50 +    'samba' :512,
    1.51 +    'vpn'   :192,
    1.52 +    'uucp'  :128,
    1.53 +    'apt'   :128,
    1.54  }
    1.55  
    1.56  vcpus_table={
    1.57 -	'dozor'	:4, 
    1.58 -	'dns'	:2, 
    1.59 -	'gw' 	:1, 
    1.60 -	'igw'	:1, 
    1.61 -	'pgw' 	:1, 
    1.62 -	'ldap'	:1, 
    1.63 -	'mail'	:4, 
    1.64 -	'proxy'	:4, 
    1.65 -	'samba'	:4, 
    1.66 -	'vpn'	:4,
    1.67 -	'uucp'	:4,
    1.68 -	'vvidd'	:4,
    1.69 -	'apt'   :2,
    1.70 +    'dns'   :1,
    1.71 +    'gw'    :1,
    1.72 +    'igw'   :1,
    1.73 +    'pgw'   :1,
    1.74 +    'ldap'  :1,
    1.75 +    'mail'  :4,
    1.76 +    'samba' :4,
    1.77 +    'vpn'   :4,
    1.78 +    'uucp'  :4,
    1.79 +    'apt'   :2,
    1.80  }
    1.81  
    1.82  lvm_vg_name="TURBO"
    1.83  disk_table={
    1.84 -	'gw' 		: ['drbd1'], 
    1.85 -	'igw'		: ['drbd2'], 
    1.86 -	'dns'		: ['drbd3'], 
    1.87 -	'vpn'		: ['drbd4'],
    1.88 -	'apt'		: ['drbd5'],
    1.89 -	'proxy'		: ['drbd6'], 
    1.90 -	'pgw'		: ['drbd7'], 
    1.91 -	'ldap'		: ['drbd8'], 
    1.92 -	'mail'		: ['drbd10','drbd12:maildir'], 
    1.93 -	'uucp'		: ['drbd11'], 
    1.94 -	'samba'		: [ 
    1.95 -				'drbd18', 
    1.96 -				'drbd13:samba-home', 
    1.97 -				'drbd14:samba-nbumail', 
    1.98 -				'drbd15:samba-arm3', 
    1.99 -				'drbd16:samba-boxes', 
   1.100 -				'drbd17:samba-profiles' 
   1.101 -			  ],
   1.102 -	'dozor'		: ['drbd19'], 
   1.103 -	'vvidd'		: ['drbd20'], 
   1.104 +    'gw'        : ['drbd1:gw:2G'], 
   1.105 +    'igw'       : ['drbd2:igw:2G'], 
   1.106 +    'dns'       : ['drbd3:dns:2G'], 
   1.107 +    'vpn'       : ['drbd4:vpn:2G'],
   1.108 +    'apt'       : ['drbd5:apt:10G'],
   1.109 +    'pgw'       : ['drbd6:pgw:2G'],
   1.110 +    'ldap'      : ['drbd7:ldap:2G'], 
   1.111 +    'mail'      : ['drbd8:mail:2G','drbd9:maildir:100G'], 
   1.112 +    'uucp'      : ['drbd11:uucp:3G'], 
   1.113 +    'samba'     : [ 
   1.114 +                'drbd12:samba:3G', 
   1.115 +                'drbd13:samba-home:100G', 
   1.116 +                'drbd14:samba-nbumail:100G', 
   1.117 +                'drbd17:samba-profiles:100G' 
   1.118 +              ],
   1.119  }
   1.120  
   1.121  bridges=['tagged0', 'xenbr1', 'xenbr256', 'xenbr257', 'xenbr3', 'xenbr4', 'xenbr501']
   1.122 @@ -82,33 +71,46 @@
   1.123  management_vlan=1
   1.124  trunk='eth0'
   1.125  management_ip=ip_address[i_am]
   1.126 -management_gw='10.0.1.253'
   1.127 +management_gw='10.0.5.253'
   1.128  
   1.129  vbridges_table={
   1.130 -	'dozor'		: ['xenbr3'], 
   1.131 -	'dns'		: ['xenbr3'], 
   1.132 -	'gw' 		: ['xenbr501', 'xenbr256', 'xenbr257'], 
   1.133 -	'igw'		: ['tagged0','xenbr3'], 
   1.134 -	'pgw'		: ['xenbr3','xenbr501'], 
   1.135 -	'ldap'		: ['xenbr3'], 
   1.136 -	'mail'		: ['xenbr3'], 
   1.137 -	'proxy'		: ['xenbr3'], 
   1.138 -	'samba'		: ['tagged0', 'xenbr3'],
   1.139 -	'vpn'		: ['xenbr3'],
   1.140 -	'vvidd'		: ['xenbr3'],
   1.141 -	'apt'		: ['xenbr3'],
   1.142 -	'uucp'		: ['xenbr3'],
   1.143 +    'dns'       : ['xenbr3'], 
   1.144 +    'gw'        : ['xenbr501', 'xenbr256', 'xenbr257'], 
   1.145 +    'igw'       : ['tagged0','xenbr3'], 
   1.146 +    'pgw'       : ['xenbr3','xenbr501'], 
   1.147 +    'ldap'      : ['xenbr3'], 
   1.148 +    'mail'      : ['xenbr3'], 
   1.149 +    'samba'     : ['tagged0', 'xenbr3'],
   1.150 +    'vpn'       : ['xenbr3'],
   1.151 +    'apt'       : ['xenbr3'],
   1.152 +    'uucp'      : ['xenbr3'],
   1.153  }
   1.154  
   1.155  # FOR INSTALLATION ONLY
   1.156  
   1.157 -ip_network="10.0.3"
   1.158 -domain_name="eb.co.ua"
   1.159 -ip_nameserver="10.0.3.4"
   1.160 +ip_network="10.4.3"
   1.161 +ip_netmask="255.255.255.224"
   1.162 +domain_name="od.eb.co.ua"
   1.163 +ip_nameserver="10.4.3.4"
   1.164  ip_gateway="10.0.3.3"
   1.165  
   1.166 -debian_release="etch"
   1.167 -debian_mirror="http://debian.org.ua/debian"
   1.168 -apt_get_install="less tcpdump libpam-ldap libnss-ldap snmpd libc6-xen openssh-server"
   1.169 +ip_address_table={
   1.170 +    "dns"   :"10.4.3.4",
   1.171 +    "gw"    :"10.4.3.254",
   1.172 +    "igw"   :"10.4.3.3",
   1.173 +    "pgw"   :"10.4.3.6",
   1.174 +    "ldap"  :"10.4.3.11",
   1.175 +    "mail"  :"10.4.3.9",
   1.176 +    "samba" :"10.4.3.1",
   1.177 +    "vpn"   :"10.4.3.5",
   1.178 +    "apt"   :"10.4.3.7",
   1.179 +    "uucp"  :"10.4.3.16",
   1.180 +    "jabber":"10.4.3.12",
   1.181  
   1.182 +}
   1.183  
   1.184 +debian_release="lenny"
   1.185 +debian_mirror="http://apt.eb.co.ua:9999/"
   1.186 +apt_get_install="less tcpdump dnsutils vim ntp screen snmpd libc6-xen openssh-server"
   1.187 +
   1.188 +