From 9732c0af89f21490cc8d6bc80799bbc8b36fb441 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justinsb@justinsb-desktop>
Date: Thu, 14 Oct 2010 13:38:35 -0700
Subject: Minimized diff, fixed formatting

---
 nova/virt/libvirt.uml.xml.template | 2 +-
 nova/virt/libvirt.xen.xml.template | 2 +-
 nova/virt/libvirt_conn.py          | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

(limited to 'nova/virt')

diff --git a/nova/virt/libvirt.uml.xml.template b/nova/virt/libvirt.uml.xml.template
index f6e5fad69..da9588049 100644
--- a/nova/virt/libvirt.uml.xml.template
+++ b/nova/virt/libvirt.uml.xml.template
@@ -12,7 +12,7 @@
             <target dev='ubd0' bus='uml'/>
         </disk>
         <interface type='bridge'>
-        	<source bridge='${bridge_name}'/>
+            <source bridge='${bridge_name}'/>
             <mac address='${mac_address}'/>
             <filterref filter="nova-instance-${name}">
                 <parameter name="IP" value="${ip_address}" />
diff --git a/nova/virt/libvirt.xen.xml.template b/nova/virt/libvirt.xen.xml.template
index 9508ad3b7..8f650e512 100644
--- a/nova/virt/libvirt.xen.xml.template
+++ b/nova/virt/libvirt.xen.xml.template
@@ -23,7 +23,7 @@
             <target dev='sda' />
         </disk>
         <interface type='bridge'>
-        	<source bridge='${bridge_name}'/>
+            <source bridge='${bridge_name}'/>
             <mac address='${mac_address}'/>
         </interface>
         <console type="file">
diff --git a/nova/virt/libvirt_conn.py b/nova/virt/libvirt_conn.py
index ba5d6dbac..ece98087b 100644
--- a/nova/virt/libvirt_conn.py
+++ b/nova/virt/libvirt_conn.py
@@ -72,6 +72,7 @@ flags.DEFINE_bool('allow_project_net_traffic',
                   True,
                   'Whether to allow in project network traffic')
 
+
 def get_connection(read_only):
     # These are loaded late so that there's no need to install these
     # libraries when not using libvirt.
@@ -126,6 +127,7 @@ class LibvirtConnection(object):
         auth = [[libvirt.VIR_CRED_AUTHNAME, libvirt.VIR_CRED_NOECHOPROMPT],
                 'root',
                 None]
+        
         if read_only:
             return libvirt.openReadOnly(uri)
         else:
-- 
cgit