# HG changeset patch
# User igor
# Date 1190986370 -10800
# Node ID 0b0a886abd08d65739d7dcd483d39f45cce29404
# Parent  3ce02620180cb235280f32c36641174b22aa2230
+ xen-drbd fix

diff -r 3ce02620180c -r 0b0a886abd08 eb.py
--- a/eb.py	Fri Sep 28 16:08:02 2007 +0300
+++ b/eb.py	Fri Sep 28 16:32:50 2007 +0300
@@ -37,6 +37,22 @@
 	'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'], 
diff -r 3ce02620180c -r 0b0a886abd08 xen-drbd-start.py
--- a/xen-drbd-start.py	Fri Sep 28 16:08:02 2007 +0300
+++ b/xen-drbd-start.py	Fri Sep 28 16:32:50 2007 +0300
@@ -19,6 +19,7 @@
 
 
 memory=mem_table[domain]
+vcpus=vcpus_table[domain]
 
 disk=[]
 i=0
@@ -27,7 +28,7 @@
 	if disk_description.find(":") == -1:
 		disk.append('phy:/dev/drbd/%s,hda%s,w' % (domain,i) )
 	else:
-		disk.append('phy:/dev/drbd/%s,hda%s,w' % ((disk_description.split(':'))[0],i) )
+		disk.append('phy:/dev/drbd/%s,hda%s,w' % ((disk_description.split(':'))[1],i) )
 
 vif=[]
 vbridges = vbridges_table[domain]
@@ -44,6 +45,7 @@
     print "kernel =", kernel
     print "ramdisk =", ramdisk
     print "memory =", memory
+    print "vcpus =", vcpus
     print "disk =", disk
     print "vif =", vif
     print "root =", root