new run-virt.include for xen plugin. qemukvm modules now loaded via runlevelscript qemukvm, script added to sudoers as well. better ideas?

1 files changed, 46 insertions, 68 deletions

diff --git a/os-plugins/plugins/xen/files/machine.include b/os-plugins/plugins/xen/files/machine.include
index 93adca75..a1573578 100644
--- a/os-plugins/plugins/xen/files/machine.include
+++ b/os-plugins/plugins/xen/files/machine.include
@@ -1,62 +1,55 @@
+# This is an machine template for run-virt.include of the Xen plugin.
+# This template was taken from an example in openSUSE 11.2
+
+cat <<EOF
 #  -*- mode: python; -*-
 #============================================================================
 # Python configuration setup for 'xm create'.
-# This script sets the parameters used when a domain is created using 'xm create'.
-# You use a separate script for each domain you want to create, or 
-# you can set the parameters for the domain on the xm command line.
+# This configuration was created through $0 on $(date)
 #============================================================================
 
 #----------------------------------------------------------------------------
 # Kernel image file and (optional) ramdisk (initrd).
-kernel = "/boot/vmlinuz-xen"
-ramdisk = "/boot/initrd-xen"
+kernel = "${xen_kernel}"
+ramdisk = "${xen_ramdisk}"
 
 # Or use domUloader instead of kernel/ramdisk to get kernel from domU FS
 #bootloader = "/usr/lib/xen/boot/domUloader.py"
-#bootentry = "hda2:/vmlinuz-xen,/initrd-xen"
+#bootentry = "hda1:/${xen_kernel},/${xen_ramdisk}"
+# TODO: check these:
+#bootargs="--entry=xvda2:/boot/vmlinuz-xen,/boot/initrd-xen"
+
+localtime=0
 
-# The domain build function. Default is 'linux'.
-#builder='linux'
+# The domain build function. Default is 'linux', HVM domain uses 'hvm'.
+builder = 'linux'
 
 # Initial memory allocation (in megabytes) for the new domain.
-#
-# WARNING: Creating a domain with insufficient memory may cause out of
-#          memory errors. The domain needs enough memory to boot kernel
-#          and modules. Allocating less than 32MBs is not recommended.
-memory = 64
+memory = ${mem}
 
 # A name for your domain. All domains must have different names.
-name = "ExampleDomain"
-
-# 128-bit UUID for the domain.  The default behavior is to generate a new UUID
-# on each call to 'xm create'.
-#uuid = "06ed00fe-1162-4fc4-b5d8-11993ee4a8b9"
+name = "${vm_name}"
 
 # List of which CPUS this domain is allowed to use, default Xen picks
 #cpus = ""         # leave to Xen to pick
 #cpus = "0"        # all vcpus run on CPU0
 #cpus = "0-3,5,^1" # run on cpus 0,2,3,5
+#cpus = "${xen_cpus}"
 
 # Number of Virtual CPUS to use, default is 1
-#vcpus = 1
+#vcpus = ${xen_vcpus}
 
 #----------------------------------------------------------------------------
 # Define network interfaces.
 
-# By default, no network interfaces are configured.  You may have one created
+# By default, no network interfaces are configured. You may have one created
 # with sensible defaults using an empty vif clause:
-#
 # vif = [ '' ]
-#
 # or optionally override backend, bridge, ip, mac, script, type, or vifname:
-#
 # vif = [ 'mac=00:16:3e:00:00:11, bridge=xenbr0' ]
-#
 # or more than one interface may be configured:
-#
 # vif = [ '', 'bridge=xenbr1' ]
-
-vif = [ '' ]
+vif = [ '${xen_vif}' ]
 
 #----------------------------------------------------------------------------
 # Define the disk devices you want the domain to have access to, and
@@ -64,40 +57,26 @@ vif = [ '' ]
 # Each disk entry is of the form phy:UNAME,DEV,MODE
 # where UNAME is the device, DEV is the device name the domain will see,
 # and MODE is r for read-only, w for read-write.
-
-disk = [ 'phy:hda1,hda1,w' ]
+# disk = [ 'phy:hda1,hda1,w' ]
+disk = [ '${xen_disk}' ]
 
 #----------------------------------------------------------------------------
 # Define frame buffer device.
-#
 # By default, no frame buffer device is configured.
-#
 # To create one using the SDL backend and sensible defaults:
-#
 # vfb = [ 'type=sdl' ]
-#
 # This uses environment variables XAUTHORITY and DISPLAY.  You
 # can override that:
-#
 # vfb = [ 'type=sdl,xauthority=/home/bozo/.Xauthority,display=:1' ]
-#
 # To create one using the VNC backend and sensible defaults:
-#
 # vfb = [ 'type=vnc' ]
-#
 # The backend listens on 127.0.0.1 port 5900+N by default, where N is
 # the domain ID.  You can override both address and N:
-#
 # vfb = [ 'type=vnc,vnclisten=127.0.0.1,vncdisplay=1' ]
-#
 # Or you can bind the first unused port above 5900:
-#
 # vfb = [ 'type=vnc,vnclisten=0.0.0.0,vnunused=1' ]
-#
 # You can override the password:
-#
 # vfb = [ 'type=vnc,vncpasswd=MYPASSWD' ]
-#
 # Empty password disables authentication.  Defaults to the vncpasswd
 # configured in xend-config.sxp.
 
@@ -123,16 +102,16 @@ disk = [ 'phy:hda1,hda1,w' ]
 # variables used by custom rc scripts (e.g. VMID=, usr= ).
 
 # Set if you want dhcp to allocate the IP address.
-#dhcp="dhcp"
+dhcp="${xen_dhcp}"
 # Set netmask.
 #netmask=
 # Set default gateway.
 #gateway=
 # Set the hostname.
-#hostname= "vm%d" % vmid
+hostname= "${hostname}"
 
-# Set root device.
-root = "/dev/hda1"
+# Set root device (eg. /dev/hda1).
+root = "${xen_root}"
 
 # Root device for nfs.
 #root = "/dev/nfs"
@@ -142,13 +121,13 @@ root = "/dev/hda1"
 #nfs_root   = '/full/path/to/root/directory'
 
 # Extra arguments to pass to the kernel.
-extra = ""
+# Eg: set runlevel
+extra = "${xen_extra}"
 
 #----------------------------------------------------------------------------
 # Configure the behaviour when a domain exits.  There are three 'reasons'
 # for a domain to stop: poweroff, reboot, and crash.  For each of these you
 # may specify:
-#
 #   "destroy",        meaning that the domain is cleaned up as normal;
 #   "restart",        meaning that a new domain is started in place of the old
 #                     one;
@@ -156,34 +135,33 @@ extra = ""
 #                     manually destroyed (using xm destroy, for example); or
 #   "rename-restart", meaning that the old domain is not cleaned up, but is
 #                     renamed and a new domain started in its place.
-#
 # In the event a domain stops due to a crash, you have the additional options:
-#
 #   "coredump-destroy", meaning dump the crashed domain's core and then destroy;
 #   "coredump-restart', meaning dump the crashed domain's core and the restart.
-#
 # The default is
-#
 #   on_poweroff = 'destroy'
 #   on_reboot   = 'restart'
 #   on_crash    = 'restart'
-#
-# For backwards compatibility we also support the deprecated option restart
-#
-# restart = 'onreboot' means on_poweroff = 'destroy'
-#                            on_reboot   = 'restart'
-#                            on_crash    = 'destroy'
-#
-# restart = 'always'   means on_poweroff = 'restart'
-#                            on_reboot   = 'restart'
-#                            on_crash    = 'restart'
-#
-# restart = 'never'    means on_poweroff = 'destroy'
-#                            on_reboot   = 'destroy'
-#                            on_crash    = 'destroy'
-
 #on_poweroff = 'destroy'
 #on_reboot   = 'restart'
 #on_crash    = 'restart'
 
+#-----------------------------------------------------------------------------
+#   Configure PVSCSI devices:
+#   PDEV   gives physical SCSI device to be attached to specified guest
+#          domain by one of the following identifier format.
+#          - XX:XX:XX:XX (4-tuples with decimal notation which shows
+#                          "host:channel:target:lun")
+#          - /dev/sdxx or sdx
+#          - /dev/stxx or stx
+#          - /dev/sgxx or sgx
+#          - result of 'scsi_id -gu -s'.
+#            ex. # scsi_id -gu -s /block/sdb
+#                  36000b5d0006a0000006a0257004c0000
+#   VDEV   gives virtual SCSI device by 4-tuples (XX:XX:XX:XX) as 
+#          which the specified guest domain recognize.
+#vscsi = [ 'PDEV, VDEV' ]
+#vscsi = [ '/dev/sdx, 0:0:0:0' ]
+
 #============================================================================
+EOF