From a80b06285d993696ccb90eff00bb2963df49ecc6 Mon Sep 17 00:00:00 2001
From: Vishvananda Ishaya <vishvananda@yahoo.com>
Date: Sun, 24 Oct 2010 17:18:24 -0700
Subject: add in the xen rescue template

---
 nova/virt/libvirt.rescue.xen.xml.template | 34 +++++++++++++++++++++++++++++++
 nova/virt/libvirt.xen.xml.template        |  6 +-----
 nova/virt/libvirt_conn.py                 |  3 +++
 3 files changed, 38 insertions(+), 5 deletions(-)
 create mode 100644 nova/virt/libvirt.rescue.xen.xml.template

diff --git a/nova/virt/libvirt.rescue.xen.xml.template b/nova/virt/libvirt.rescue.xen.xml.template
new file mode 100644
index 000000000..3b8d27237
--- /dev/null
+++ b/nova/virt/libvirt.rescue.xen.xml.template
@@ -0,0 +1,34 @@
+<domain type='%(type)s'>
+    <name>%(name)s</name>
+    <os>
+        <type>linux</type>
+        <kernel>%(basepath)s/kernel</kernel>
+        <initrd>%(basepath)s/ramdisk</initrd>
+        <root>/dev/xvda1</root>
+        <cmdline>ro</cmdline>
+    </os>
+    <features>
+        <acpi/>
+    </features>
+    <memory>%(memory_kb)s</memory>
+    <vcpu>%(vcpus)s</vcpu>
+    <devices>
+        <disk type='file'>
+            <source file='%(basepath)s/rescue-disk'/>
+            <target dev='sda' />
+        </disk>
+        <disk type='file'>
+            <source file='%(basepath)s/disk'/>
+            <target dev='sdb' />
+        </disk>
+        <interface type='bridge'>
+            <source bridge='%(bridge_name)s'/>
+            <mac address='%(mac_address)s'/>
+        </interface>
+        <console type="file">
+            <source path='%(basepath)s/console.log'/>
+            <target port='1'/>
+        </console>
+    </devices>
+</domain>
+
diff --git a/nova/virt/libvirt.xen.xml.template b/nova/virt/libvirt.xen.xml.template
index 3b8d27237..9677902c6 100644
--- a/nova/virt/libvirt.xen.xml.template
+++ b/nova/virt/libvirt.xen.xml.template
@@ -13,13 +13,9 @@
     <memory>%(memory_kb)s</memory>
     <vcpu>%(vcpus)s</vcpu>
     <devices>
-        <disk type='file'>
-            <source file='%(basepath)s/rescue-disk'/>
-            <target dev='sda' />
-        </disk>
         <disk type='file'>
             <source file='%(basepath)s/disk'/>
-            <target dev='sdb' />
+            <target dev='sda' />
         </disk>
         <interface type='bridge'>
             <source bridge='%(bridge_name)s'/>
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index 0096b1400..e32945fa5 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -51,6 +51,9 @@ FLAGS = flags.FLAGS
 flags.DEFINE_string('libvirt_rescue_xml_template',
                     utils.abspath('virt/libvirt.rescue.qemu.xml.template'),
                     'Libvirt RESCUE XML Template for QEmu/KVM')
+flags.DEFINE_string('libvirt_rescue_xen_xml_template',
+                    utils.abspath('virt/libvirt.rescue.xen.xml.template'),
+                    'Libvirt RESCUE XML Template for xen')
 flags.DEFINE_string('libvirt_rescue_uml_xml_template',
                     utils.abspath('virt/libvirt.rescue.uml.xml.template'),
                     'Libvirt RESCUE XML Template for user-mode-linux')
-- 
cgit