Changeset 190

Timestamp:

Aug 26, 2010, 10:45:59 PM (14 years ago)

Author:

rock

Message:

Milestone: drbl-virt deployment completion.
Next Milestone: drbl-virt VM management interface.

Location:

drbl-virt/sbin

Files:

• drbl_xen_repush.sh (modified) (4 diffs)
• functions_drbl_virt (modified) (1 diff)
• xen_install.sh (modified) (1 diff)

drbl-virt/sbin/drbl_xen_repush.sh

@@ -25 +25 @@
     echo "DRBL environment has muiltpule netwrok card(NIC)."
 fi   
-     
+   
+# backup IP_HOST_TABLE
+if [ -e /etc/drbl/IP_HOST_TABLE.drbl-virt_bak ]; then
+    cp /etc/drbl/IP_HOST_TABLE /etc/drbl/IP_HOST_TABLE.$(date +%Y-%m-%d-%H-%M-%S).drbl-virt_bak
+    cp -f /etc/drbl/IP_HOST_TABLE.drbl-virt_bak /etc/drbl/IP_HOST_TABLE
+else
+    cp /etc/drbl/IP_HOST_TABLE /etc/drbl/IP_HOST_TABLE.drbl-virt_bak
+fi  
+
 for eth in $eths
 do   
@@ -45 +53 @@
     VM_last_IP=""
     VM_prefix_name=""
+
     get_VM_IP_range_and_prefix_name
     create_VM_IP_table
@@ -57 +66 @@
     VM_hosts=$(cat /opt/drbl-virt/etc/IP_VM_$eth | awk '{print $2}')
     VM_MACs=$(cat /opt/drbl-virt/etc/macadr-VM-$eth.txt)
-
-    #echo -e "VM_IPs=$VM_IPs \n VM_IPs_nu=$VM_IPs_nu \n VM_hosts=$VM_hosts \n VM_MACs=$VM_MACs"
-
-    # delete duplicating value(ip,hostname) in IP_HOST_TABLE
-    #if [ -e /etc/drbl/IP_HOST_TABLE ]; then
-    #$Work_Path/duplicate_del /etc/drbl/IP_HOST_TABLE
-    #fi
-    # add ip & hostname
-    #$Work_Path/add_value /opt/drbl-virt/etc/IP_VM_$eth /etc/drbl/IP_HOST_TABLE $eth
-    
-    # == delete duplicating MAC ==
     
     # == Add Mac address to macadr-ethX.txt ==
@@ -80 +78 @@
 # == Cheange Xen Kernel ==   
 Xen_Kernel=$(cat $Work_Home/etc/Xen_Kernel)
-read -p "Xen_Kernel=$Xen_Kernel"
+#read -p "Xen_Kernel=$Xen_Kernel"
 echo "/opt/drbl/sbin/drblsrv-offline -s $Xen_Kernel"
 /opt/drbl/sbin/drblsrv-offline -s $Xen_Kernel                                                                                                                        

drbl-virt/sbin/functions_drbl_virt

@@ -327 +327 @@
 
 function delete_duplicating_MAC(){
-# backup
 drbl_mac_file="/etc/drbl/macadr-$eth.txt"
-cp $drbl_mac_file $drbl_mac_file.$(date +%Y-%m-%d-%H-%M-%S).drbl-virt_bak 
-
-read -p "debug $VM_MACs"
-# Delete duplating VM MAC
-for vm_mac in $(echo $VM_MACs)
-do
-    vm_mac_lines=$(cat -n $drbl_mac_file | grep $vm_mac | awk '{print $1}' )
-    read -p "DEBUG vm_mac_lines $vm_mac_lines"
-    # no duplicated vlaue, doesn't do it
-    if [ -n "$vm_mac_lines" ]; then
-        vm_mac_count=$(echo $vm_mac_lines | wc -w)
-        read -p "de vm_mac_count $vm_mac_count"
-        for (( i=1 ; i<=${vm_mac_count} ; i++ ))
-        do
-            del_line=$(echo $vm_mac_lines | cut -d " " -f${i})
-            sed -i "${del_line}d" $drbl_mac_file
-        done
-        bash
-    fi
-done
+# if macadr-ethX.txt.drbl-virt_bak already have, backup it 
+# else cp default backup
+if [ -e $drbl_mac_file.drbl-virt_bak ]; then
+    cp $drbl_mac_file $drbl_mac_file.$(date +%Y-%m-%d-%H-%M-%S).drbl-virt_bak
+    cp -f $drbl_mac_file.drbl-virt_bak $drbl_mac_file
+else 
+    cp $drbl_mac_file $drbl_mac_file.drbl-virt_bak
+fi
+
+    # Delete duplating VM MAC
+    for vm_mac in $(echo $VM_MACs)
+    do
+        vm_mac_lines=$(cat -n $drbl_mac_file | grep $vm_mac | awk '{print $1}' )
+        # no duplicated vlaue, doesn't do it
+        if [ -n "$vm_mac_lines" ]; then
+            vm_mac_count=$(echo $vm_mac_lines | wc -w)
+            for (( i=1 ; i<=${vm_mac_count} ; i++ ))
+            do
+                del_line=$(echo $vm_mac_lines | cut -d " " -f${i})
+                sed -i "${del_line}d" $drbl_mac_file
+            done
+        fi
+    done
 }  
 

drbl-virt/sbin/xen_install.sh

@@ -51 +51 @@
             if [ $hypervisior == "Xen" ]; then
                 echo ""
-                echo "Install Xen Hypervisior"
+                echo "[Install Xen Hypervisior]"
+                echo ""
                 aptitude install xen-linux-system-2.6.26-2-xen-${Linux_bit} xen-tools bridge-utils python-xml ipcalc
                 cp $Work_Home/conf/debian-lenny_xend-config.sxp /etc/xen/xend-config.sxp