diff --git a/docs/drvlxc.html.in b/docs/drvlxc.html.in index f67b7d0d3c02826c53714b0740b3e7a63ba15626..cfcfdab2abe9f01e4fb0a7b24c2328633cf101f0 100644 --- a/docs/drvlxc.html.in +++ b/docs/drvlxc.html.in @@ -13,24 +13,24 @@ start it using
<domain type='lxc'> - <name>vm1</name> - <memory>500000</memory> - <os> - <type>exe</type> - <init>/bin/sh</init> - </os> - <vcpu>1</vcpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/libexec/libvirt_lxc</emulator> - <interface type='network'> - <source network='default'/> - </interface> - <console type='pty' /> - </devices> + <name>vm1</name> + <memory>500000</memory> + <os> + <type>exe</type> + <init>/bin/sh</init> + </os> + <vcpu>1</vcpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <interface type='network'> + <source network='default'/> + </interface> + <console type='pty' /> + </devices> </domain>@@ -42,28 +42,28 @@ debootstrap, whatever) under /opt/vm-1-root:
<domain type='lxc'> - <name>vm1</name> - <memory>32768</memory> - <os> - <type>exe</type> - <init>/init</init> - </os> - <vcpu>1</vcpu> - <clock offset='utc'/> - <on_poweroff>destroy</on_poweroff> - <on_reboot>restart</on_reboot> - <on_crash>destroy</on_crash> - <devices> - <emulator>/usr/libexec/libvirt_lxc</emulator> - <filesystem type='mount'> - <source dir='/opt/vm-1-root'/> - <target dir='/'/> - </filesystem> - <interface type='network'> - <source network='default'/> - </interface> - <console type='pty' /> - </devices> + <name>vm1</name> + <memory>32768</memory> + <os> + <type>exe</type> + <init>/init</init> + </os> + <vcpu>1</vcpu> + <clock offset='utc'/> + <on_poweroff>destroy</on_poweroff> + <on_reboot>restart</on_reboot> + <on_crash>destroy</on_crash> + <devices> + <emulator>/usr/libexec/libvirt_lxc</emulator> + <filesystem type='mount'> + <source dir='/opt/vm-1-root'/> + <target dir='/'/> + </filesystem> + <interface type='network'> + <source network='default'/> + </interface> + <console type='pty' /> + </devices> </domain>diff --git a/docs/drvone.html.in b/docs/drvone.html.in index 1745be1675f02d8eab9dfc09c2d662722c9699cc..036c0c78e8d1b13eb53bc87beede7f4db58e2aec 100644 --- a/docs/drvone.html.in +++ b/docs/drvone.html.in @@ -27,12 +27,13 @@ tools and VM description files.
The Uri of the driver protocol is "one". Some example connection Uris for the driver are:
-one:/// (local access) - one+unix:/// (local access) - one://example.com/ (remote access) - one+tcp://example.com/ (remote access, SASl/Kerberos) - one+ssh://user@example.com/ (remote access, SSH tunnelled) -+
+one:/// (local access) +one+unix:/// (local access) +one://example.com/ (remote access) +one+tcp://example.com/ (remote access, SASl/Kerberos) +one+ssh://user@example.com/ (remote access, SSH tunnelled) +
There are some limitations on the XML attributes that may be @@ -42,51 +43,51 @@ driver:
<domain type='one'> - <name>vm01</name> - <memory>32768</memory> - <vcpu>1</vcpu> ++<domain type='one'> + <name>vm01</name> + <memory>32768</memory> + <vcpu>1</vcpu> - <os> - <type>linux</type> - <kernel>/boot/vmlinuz-2.6.24-17-xen</kernel> - <initrd>/boot/initrd.img-2.6.24-17-xen</initrd> - <cmdline></cmdline> - <root>sda1</root> - </os> + <os> + <type>linux</type> + <kernel>/boot/vmlinuz-2.6.24-17-xen</kernel> + <initrd>/boot/initrd.img-2.6.24-17-xen</initrd> + <cmdline></cmdline> + <root>sda1</root> + </os> - <devices> + <devices> + <disk type='file' device='disk'> + <source file='/images/sgehosts/01/disk.img'/> + <target dev='sda1'/> + </disk> - <disk type='file' device='disk'> - <source file='/images/sgehosts/01/disk.img'/> - <target dev='sda1'/> - </disk> + <disk type='file' device='disk'> + <source file='/images/sgehosts/01/swap.img'/> + <target dev='sda2'/> + </disk> - <disk type='file' device='disk'> - <source file='/images/sgehosts/01/swap.img'/> - <target dev='sda2'/> - </disk> + <disk type='file' device='cdrom'> + <source file='/images/iso/cdrom.iso'/> + <target dev='hdc'/> + <readonly/> + </disk> - <disk type='file' device='cdrom'> - <source file='/images/iso/cdrom.iso'/> - <target dev='hdc'/> - <readonly/> - </disk> + <!--BRIDGE--> + <interface type='bridge'> + <source bridge='eth0'/> + <mac address='00:16:3e:5d:c7:9e'/> + </interface> - <!--BRIDGE--> - <interface type='bridge'> - <source bridge='eth0'/> - <mac address='00:16:3e:5d:c7:9e'/> - </interface> - - <!--ONE Network--> - <interface type='network'> - <source network='onenetwork'/> - </interface> - </devices> - </domain> -+ <!--ONE Network--> + <interface type='network'> + <source network='onenetwork'/> + </interface> + </devices> +</domain> +
Note: The "<interface type='network'>" will attach the interface to a previously configured network (named diff --git a/docs/drvopenvz.html.in b/docs/drvopenvz.html.in index b2beadb5bca46c315dfb9b9f659df819099ff95a..e446b1a880e75dbea597f3016cf67b545845061d 100644 --- a/docs/drvopenvz.html.in +++ b/docs/drvopenvz.html.in @@ -19,13 +19,13 @@ the libvirt driver are:
-- openvz:///system (local access) - openvz+unix:///system (local access) - openvz://example.com/system (remote access, TLS/x509) - openvz+tcp://example.com/system (remote access, SASl/Kerberos) - openvz+ssh://root@example.com/system (remote access, SSH tunnelled) -+
+openvz:///system (local access) +openvz+unix:///system (local access) +openvz://example.com/system (remote access, TLS/x509) +openvz+tcp://example.com/system (remote access, SASl/Kerberos) +openvz+ssh://root@example.com/system (remote access, SSH tunnelled) +
+#!/bin/bash EXTERNAL_SCRIPT="/usr/sbin/vznetaddbr" -+
The host OS is now ready to allow bridging of guest containers, which @@ -83,7 +83,7 @@ EXTERNAL_SCRIPT="/usr/sbin/vznetaddbr" matches the templates known to OpenVZ tools.
-+<domain type='openvz' id='104'> <name>104</name> <uuid>86c12009-e591-a159-6e9f-91d18b85ef78</uuid> @@ -104,7 +104,7 @@ EXTERNAL_SCRIPT="/usr/sbin/vznetaddbr" </interface> </devices> </domain> -+