Changeset 200 for drbl-virt

Timestamp:

Aug 30, 2010, 11:11:57 AM (14 years ago)

Author:

rock

Message:

Bugfix: var error

Location:

drbl-virt

Files:

• sbin/check_drbl_client.sh (modified) (1 diff)
• sbin/check_drbl_vm.sh (modified) (3 diffs)
• sbin/drbl_PXE_PV-VM_create.sh (modified) (2 diffs)
• sbin/drbl_xen_repush.sh (modified) (1 diff)
• uninstall.sh (modified) (2 diffs)
• web/WebContent/css/jquery-ui.css (modified) (1 diff)
• web/WebContent/image (added)
• web/WebContent/image/drbl-virt_logo.png (added)
• web/WebContent/index.html (modified) (1 diff)

drbl-virt/sbin/check_drbl_client.sh

@@ -40 +40 @@
         client_Ram=$(cat $drbl_client_top_file | grep ^Mem | sed 's/total.*$//' | sed 's/^Mem://' | awk '{print $1}')
         client_unused_Ram=$(cat $drbl_client_top_file | grep ^Mem | sed 's/^.*used,//' | sed 's/free.*$//' | awk '{print $1}')
+    
     fi
 

drbl-virt/sbin/check_drbl_vm.sh

@@ -19 +19 @@
 
 # [Main] 
+check_root
 for client_IP in $client_IPs
 do
@@ -42 +43 @@
         declare -i i=1
 
-        vm_numbers=$(echo vm_hostnames | wc -w)
-        
+        vm_numbers=$(echo $vm_hostnames | wc -w)
+
         printf "[Running VM: $vm_numbers]\n" >> $drbl_vm_file
         printf "[Running VM: $vm_numbers]\n"
@@ -53 +54 @@
             vm_CPU_loading="$(cat $drbl_vm_xentop_file | grep $vm_hostname | awk '{print $4}')"
             vm_Ram_loading="$(cat $drbl_vm_xentop_file | grep $vm_hostname | awk '{print $6}')"
-            printf "VM$i: $vm_hostname $vm_CPU_core ${vm_Ram}M $vm_CPU_loading%% $vm_Ram_loading%%\n" >> $drbl_vm_file
-            printf "VM$i: $vm_hostname VCPU=$vm_CPU_core Mem=${vm_Ram}M VCPU_loading=$vm_CPU_loading%% Mem_usage=$vm_Ram_loading%%\n"
+            printf "VM$i: $vm_hostname $vm_CPU_core ${vm_Ram}K $vm_CPU_loading%% $vm_Ram_loading%%\n" >> $drbl_vm_file
+            printf "VM$i: $vm_hostname VCPU=$vm_CPU_core Mem=${vm_Ram}K VCPU_loading=$vm_CPU_loading%% Mem_usage=$vm_Ram_loading%%\n"
             i=i+1
         done
     
+    else
+        echo "[Error] $client_hostname $client_IP is offline !" && exit 2
+
     fi
+
 done
 

drbl-virt/sbin/drbl_PXE_PV-VM_create.sh

@@ -107 +107 @@
 # check null value
 [ -z $vm_name ] && echo "[Error] no VM name" && Usage && exit 2
+# check vm_name exist
+vm_IP_files=$(ls $Work_Home/etc/IP_VM_eth*)
+vm_exist_jude="no"
+for vm_IP_file in $vm_IP_files
+do
+    if [ -n "$(grep "$vm_name" $vm_IP_file)" ]; then
+        vm_exist_jude="yes"
+    fi
+    
+done
+
+if [ $vm_exist_jude == "no" ]; then
+    echo "[Error] This VM name isn't DRBL PXE VM"
+    exit 2
+fi
+
 
 # = 2. Get VM MAC address =
@@ -149 +165 @@
 echo "kernel      = '/home/domains/vmlinuz-pxe'" > $vm_cfg
 echo "ramdisk     = '/home/domains/initrd-pxe.img'" >> $vm_cfg
-echo "memory      = '512'" >> $vm_cfg
+echo "memory      = '$vm_ram'" >> $vm_cfg
 echo "name        = '$vm_name'" >> $vm_cfg
 echo "vcpus        = '$vm_cpu'" >> $vm_cfg

drbl-virt/sbin/drbl_xen_repush.sh

@@ -35 +35 @@
     cp /etc/drbl/IP_HOST_TABLE /opt/drbl-virt/etc/IP_HOST_TABLE
 fi  
+
+# back mac address file
+cp /etc/drbl/macadr*eth*[0-9].txt /opt/drbl-virt/etc/
 
 for eth in $eths

drbl-virt/uninstall.sh

@@ -21 +21 @@
 checkroot
 
+# = 1. For linux distribution = 
 case $Linux_Distribution in
     # for Ubuntu
@@ -57 +58 @@
 
 cd
+
+# = 2. Recovery DRBL original file =
+# patch file
+mv -f /usr/bin/mkpxeinitrd-net.drbl-virt_bak /usr/bin/mkpxeinitrd-net
+mv -f /opt/drbl/sbin/generate-pxe-menu.drbl-virt_bak /opt/drbl/sbin/generate-pxe-menu
+mv -f /usr/lib/mkpxeinitrd-net/initrd-skel/linuxrc-or-init.drbl-virt_bak /usr/lib/mkpxeinitrd-net/initrd-skel/linuxrc-or-init
+# drbl env file
+mv -f $Work_Home/etc/IP_HOST_TABLE /etc/drbl/IP_HOST_TABLE
+mv -f $Work_Home/etc/macadr-eth*[0-9].txt
+
+# = 3. Redeploy DRBL original environment =
+
+
+# = 4. Delete path =
 rm -fr $Work_Home
+
+

drbl-virt/web/WebContent/css/jquery-ui.css

@@ -8 +8 @@
  * http://docs.jquery.com/UI/Theming/API
  */
+
+/* drbl-virt */
+#wrapper {
+background:#cccccc;
+margin-bottom:7px;
+border: 4px solid #aaaaaa;
+}
 
 /* Layout helpers

drbl-virt/web/WebContent/index.html

@@ -18 +18 @@
 
 <body style="font-size:85%;">
+
+<div id="wrapper">
+<img src="image/drbl-virt_logo.png">
+</div>
 
 <div id="tabs">