diff options
| author | Nachi Ueno <ueno.nachi@lab.ntt.co.jp> | 2011-01-04 04:21:50 -0500 |
|---|---|---|
| committer | Nachi Ueno <ueno.nachi@lab.ntt.co.jp> | 2011-01-04 04:21:50 -0500 |
| commit | 56969837fdf1a9e5316443ce72b32ae268ed2947 (patch) | |
| tree | 25f24f7ff46885716c1f6c05b980b2804c003e00 | |
| parent | 4267c1f2042f6e13cd9c77eced7f02750927ee83 (diff) | |
Fixed conflict with r515
| -rw-r--r-- | nova/virt/libvirt.uml.xml.template | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/nova/virt/libvirt.uml.xml.template b/nova/virt/libvirt.uml.xml.template deleted file mode 100644 index 0d355b81c..000000000 --- a/nova/virt/libvirt.uml.xml.template +++ /dev/null @@ -1,27 +0,0 @@ -<domain type='%(type)s'> - <name>%(name)s</name> - <memory>%(memory_kb)s</memory> - <os> - <type>%(type)s</type> - <kernel>/usr/bin/linux</kernel> - <root>/dev/ubda1</root> - </os> - <devices> - <disk type='file'> - <source file='%(basepath)s/disk'/> - <target dev='ubd0' bus='uml'/> - </disk> - <interface type='bridge'> - <source bridge='%(bridge_name)s'/> - <mac address='%(mac_address)s'/> - <filterref filter="nova-instance-%(name)s"> - <parameter name="IP" value="%(ip_address)s" /> - <parameter name="DHCPSERVER" value="%(dhcp_server)s" /> - <parameter name="RASERVER" value="%(ra_server)s" /> - </filterref> - </interface> - <console type="file"> - <source path='%(basepath)s/console.log'/> - </console> - </devices> -</domain> |