Changeset 219

Timestamp:

Oct 20, 2010, 3:33:09 PM (14 years ago)

Author:

rock

Message:

Add: KVM PXE VM deployment

Location:

drbl-virt/sbin

Files:

• check_drbl_XenVM (moved) (moved from drbl-virt/sbin/check_drbl_vm)
• check_drbl_total_vm (modified) (1 diff)
• drbl_PXE_KVM-VM_deploy (added)
• drbl_PXE_PV-VM_create (modified) (1 diff)
• drbl_PXE_PV-VM_deploy (modified) (1 diff)
• drbl_bridge_kvm_patch (modified) (1 diff)
• drbl_bridge_xen_patch (modified) (1 diff)
• drbl_kvm_patch.sh (modified) (1 diff)
• drbl_xen_patch.sh (modified) (1 diff)

drbl-virt/sbin/check_drbl_total_vm

@@ -27 +27 @@
     # local variables
     vm_IPs=$(cat $vm_IP_file | awk '{print $1}')
-    IP_status="online"
 
     for vm_IP in $vm_IPs
     do
         # check network status
+        IP_status="online"
         ping -c1 -w1 $vm_IP > /dev/null 2>&1 || IP_status="offline"
         vm_IP_Hostname=$(sed -n "/$vm_IP/p" $vm_IP_file)

drbl-virt/sbin/drbl_PXE_PV-VM_create

@@ -111 +111 @@
         vm_exist_jude="yes"
     fi
-    
 done
 

drbl-virt/sbin/drbl_PXE_PV-VM_deploy

@@ -52 +52 @@
             fi 
             ;; 
-        -v|--vm_cfg)
+        -v|--vm)
             shift
             if [ -z "$(echo $1 |grep ^-.)" ]; then

drbl-virt/sbin/drbl_bridge_kvm_patch

@@ -17 +17 @@
 # = 1. Patch DRBL initrd to support bridge =
 # == Patch /usr/bin/mkpxeinitrd-net ==
-# backup mkpxeinitrd-net. if already has "drbl-virt add", dones't sed
+# backup mkpxeinitrd-net. if already has "drbl-virt add", doesn't sed
 cat /usr/bin/mkpxeinitrd-net | grep "# drbl-virt add" >> /dev/null
 if [ $? != 0 ]; then

drbl-virt/sbin/drbl_bridge_xen_patch

@@ -25 +25 @@
 cp $Work_Home/conf/initrd_bin/xen-network-common.sh /usr/lib/mkpxeinitrd-net/initrd-skel/bin/
 cp $Work_Home/conf/initrd_bin/xen-script-common.sh /usr/lib/mkpxeinitrd-net/initrd-skel/bin/
+
 # patch it to copy command
 declare -i modify_line=$(cat -n /usr/bin/mkpxeinitrd-net | grep 'include_bin_prog_from_server=' | awk '{print $1}')

drbl-virt/sbin/drbl_kvm_patch.sh

@@ -64 +64 @@
 
 # = 3. Load KVM module when booting =
+if [ -e /opt/drbl/conf/client-extra-service ]; then
+    grep 'service_extra_added="kvm"' /opt/drbl/conf/client-extra-service
+    if [ $? -eq 1 ]; then
+        echo 'service_extra_added="kvm"' >> /opt/drbl/conf/client-extra-service
+    fi
+else
+    echo 'service_extra_added="kvm"' > /opt/drbl/conf/client-extra-service
+fi
 # for Debian & Ubuntu
-if [ -e /etc/modules ]; then
-    grep kvm /etc/modules
-    if [ $? -eq 1 ]; then
-       echo "kvm" >> /etc/modules
-    fi
+#if [ -e /etc/modules ]; then
+#    grep kvm /etc/modules
+#    if [ $? -eq 1 ]; then
+#       echo "kvm" >> /etc/modules
+#    fi
 # for CentOS & Fedora
-elif [ -e /etc/sysconfig/modules ]; then
-    grep -r "modprobe kvm" /etc/sysconfig/modules/ 
-    if [ $? -eq 1 ]; then
-        cat  > /etc/sysconfig/modules/kvm.modules << EOF
-#!/bin/sh                 
-echo -n "Loading kvm module..."
-if \$(/sbin/modprobe kvm)
-    then
-        echo "[SUCCESS]:"
-    else
-        echo "[FAILURE]:"
-fi
-EOF
-    chmod +x /etc/sysconfig/modules/kvm.modules
-    fi
-fi
+#elif [ -e /etc/sysconfig/modules ]; then
+#    grep -r "modprobe kvm" /etc/sysconfig/modules/ 
+#    if [ $? -eq 1 ]; then
+#        cat  > /etc/sysconfig/modules/kvm.modules << EOF
+##!/bin/sh                 
+#echo -n "Loading kvm module..."
+#if \$(/sbin/modprobe kvm)
+#    then
+#        echo "[SUCCESS]:"
+#    else
+#        echo "[FAILURE]:"
+#fi
+#EOF
+#    chmod +x /etc/sysconfig/modules/kvm.modules
+#    fi
+#fi
 
 # = 4. Copy xen kernel & initrd to /home/domains =

drbl-virt/sbin/drbl_xen_patch.sh

@@ -72 +72 @@
 # = 3. enable xend xendomains daemon in DRBL Client =
 if [ -e /opt/drbl/conf/client-extra-service ]; then
-    echo 'service_extra_added="xend xendomains"' >> /opt/drbl/conf/client-extra-service
+    grep 'service_extra_added="xend xendomains"' /opt/drbl/conf/client-extra-service
+    if [ $? -eq 1 ]; then
+        echo 'service_extra_added="xend xendomains"' >> /opt/drbl/conf/client-extra-service
+    fi
 else
     echo 'service_extra_added="xend xendomains"' > /opt/drbl/conf/client-extra-service