From 1378db7ac86b69b8a966448b63415b2136b6b5bc Mon Sep 17 00:00:00 2001
From: Chuck Short <zulcss@ubuntu.com>
Date: Thu, 24 Mar 2011 09:07:57 -0400
Subject: Fix up formatting of libvirt.xml.template

---
 nova/virt/libvirt.xml.template | 132 ++++++++++++++++++++---------------------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/nova/virt/libvirt.xml.template b/nova/virt/libvirt.xml.template
index 77c1b1997..26f528cb1 100644
--- a/nova/virt/libvirt.xml.template
+++ b/nova/virt/libvirt.xml.template
@@ -3,47 +3,47 @@
     <memory>${memory_kb}</memory>
     <os>
 #if $type == 'lxc'
-	#set $disk_prefix = ''
+	#set $disk prefix = ''
 	#set $disk_bus = ''
 		<type>exe</type>
 		<init>/sbin/init</init>
 #else
-#if $type == 'uml'
-    #set $disk_prefix = 'ubd'
-    #set $disk_bus = 'uml'
-        <type>uml</type>
-        <kernel>/usr/bin/linux</kernel>
-        <root>/dev/ubda</root>
-#else
-    #if $type == 'xen'
-        #set $disk_prefix = 'sd'
-        #set $disk_bus = 'scsi'
-            <type>linux</type>
-            <root>/dev/xvda</root>
-    #else
-        #set $disk_prefix = 'vd'
-        #set $disk_bus = 'virtio'
-            <type>hvm</type>
-    #end if
-    #if $getVar('rescue', False)
-        <kernel>${basepath}/kernel.rescue</kernel>
-        <initrd>${basepath}/ramdisk.rescue</initrd>
-    #else
-        #if $getVar('kernel', None)
-            <kernel>${kernel}</kernel>
-            #if $type == 'xen'
-                <cmdline>ro</cmdline>
-            #else
-                <cmdline>root=/dev/vda console=ttyS0</cmdline>
-            #end if
-            #if $getVar('ramdisk', None)
-                <initrd>${ramdisk}</initrd>
-            #end if
-        #else
-            <boot dev="hd" />
-        #end if
-    #end if
-  #end if
+	#if $type == 'uml'
+		#set $disk_prefix = 'ubd'
+		#set $disk_bus = 'uml'
+			<type>uml</type>
+			<kernel>/usr/bin/linux</kernel>
+			<root>/dev/ubda</root>
+	#else
+		#if $type == 'xen'
+			#set $disk_prefix = 'sd'
+			#set $disk_bus = 'scsi'
+				<type>linux</type>
+				<root>/dev/xvda</root>
+		#else
+			#set $disk_prefix = 'vd'
+			#set $disk_bus = 'virtio'
+				<type>hvm</type>
+		#end if
+		#if $getVar('rescue', False)
+			<kernel>${basepath}/kernel.rescue</kernel>
+			<initrd>${basepath}/ramdisk.rescue</initrd>
+		#else
+			#if $getVar('kernel', None)
+				<kernel>${kernel}</kernel>
+				#if $type == 'xen'
+					<cmdline>ro</cmdline>
+				#else
+					<cmdline>root=/dev/vda console=ttyS0</cmdline>
+				#end if
+				#if $getVar('ramdisk', None)
+					<initrd>${ramdisk}</initrd>
+				#end if
+			 #else
+				<boot dev="hd" />
+			 #end if
+		#end if
+	#end if
 #end if
     </os>
     <features>
@@ -52,36 +52,36 @@
     <vcpu>${vcpus}</vcpu>
     <devices>
 #if $type == 'lxc'
-		<filesystem type='mount'>
-			<source dir='${basepath}/rootfs'/>
-			<target dir='/'/>
-		</filesystem>
-#else
-#if $getVar('rescue', False)
-        <disk type='file'>
-            <driver type='${driver_type}'/>
-            <source file='${basepath}/disk.rescue'/>
-            <target dev='${disk_prefix}a' bus='${disk_bus}'/>
-        </disk>
-        <disk type='file'>
-            <driver type='${driver_type}'/>
-            <source file='${basepath}/disk'/>
-            <target dev='${disk_prefix}b' bus='${disk_bus}'/>
-        </disk>
+	<filesystem type='mount'>
+		<source dir='${basepath}/rootfs'/>
+		<target dir='/'/>
+	</filesystem>
 #else
-        <disk type='file'>
-            <driver type='${driver_type}'/>
-            <source file='${basepath}/disk'/>
-            <target dev='${disk_prefix}a' bus='${disk_bus}'/>
-        </disk>
-    #if $getVar('local', False)
-        <disk type='file'>
-            <driver type='${driver_type}'/>
-            <source file='${basepath}/disk.local'/>
-            <target dev='${disk_prefix}b' bus='${disk_bus}'/>
-        </disk>
-    #end if
- #end if
+	#if $getVar('rescue', False)
+		    <disk type='file'>
+			    <driver type='${driver_type}'/>
+				<source file='${basepath}/disk.rescue'/>
+				<target dev='${disk_prefix}a' bus='${disk_bus}'/>
+			</disk>
+			<disk type='file'>
+				<driver type='${driver_type}'/>
+				<source file='${basepath}/disk'/>
+				<target dev='${disk_prefix}b' bus='${disk_bus}'/>
+			</disk>
+	#else
+			<disk type='file'>
+				<driver type='${driver_type}'/>
+				<source file='${basepath}/disk'/>
+				<target dev='${disk_prefix}a' bus='${disk_bus}'/>
+			</disk>
+		#if $getVar('local', False)
+			<disk type='file'>
+				<driver type='${driver_type}'/>
+				<source file='${basepath}/disk.local'/>
+				<target dev='${disk_prefix}b' bus='${disk_bus}'/>
+			</disk>
+		#end if
+#end if
 #end if
         <interface type='bridge'>
             <source bridge='${bridge_name}'/>
-- 
cgit