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/compute/disk.py               | 22 +---------------------
 nova/compute/resolv.conf.template  |  1 -
 nova/flags.py                      |  3 ++-
 nova/virt/libvirt.uml.xml.template |  2 +-
 nova/virt/libvirt.xen.xml.template |  2 +-
 nova/virt/libvirt_conn.py          |  2 ++
 6 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 nova/compute/resolv.conf.template

(limited to 'nova')

diff --git a/nova/compute/disk.py b/nova/compute/disk.py
index 4ede9a7aa..b1ddb0a1f 100644
--- a/nova/compute/disk.py
+++ b/nova/compute/disk.py
@@ -87,9 +87,7 @@ def partition(infile, outfile, local_bytes=0, local_type='ext2', execute=None):
 
 
 @defer.inlineCallbacks
-def inject_data(    image, key=None, net=None, dns=None, 
-                    remove_network_udev=False, 
-                    partition=None, execute=None):
+def inject_data(image, key=None, net=None, partition=None, execute=None):
     """Injects a ssh key and optionally net data into a disk image.
 
     it will mount the image as a fully partitioned disk and attempt to inject
@@ -137,11 +135,6 @@ def inject_data(    image, key=None, net=None, dns=None,
                     yield _inject_key_into_fs(key, tmpdir, execute=execute)
                 if net:
                     yield _inject_net_into_fs(net, tmpdir, execute=execute)
-                if dns:
-                    yield _inject_dns_into_fs(dns, tmpdir, execute=execute)
-                if remove_network_udev:
-                    yield _remove_network_udev(tmpdir, execute=execute)
-
             finally:
                 # unmount device
                 yield execute('sudo umount %s' % mapped_device)
@@ -171,16 +164,3 @@ def _inject_net_into_fs(net, fs, execute=None):
     netfile = os.path.join(fs, 'etc', 'network', 'interfaces')
     yield execute('sudo tee %s' % netfile, net)
 
-@defer.inlineCallbacks
-def _inject_dns_into_fs(dns, fs, execute=None):
-    dnsfile = os.path.join(fs, 'etc', 'resolv.conf')
-    yield execute('sudo tee %s' % dnsfile, dns)
-
-@defer.inlineCallbacks
-def _remove_network_udev(fs, execute=None):
-    # TODO(justinsb): This is correct for Ubuntu, but might not be right for
-    #  other distros.  There is a much bigger discussion to be had about what
-    #  we inject and how we inject it.
-    rulesfile = os.path.join(fs, 'etc', 'udev', 'rules.d', '70-persistent-net.rules')
-    yield execute('rm -f %s' % rulesfile)
-
diff --git a/nova/compute/resolv.conf.template b/nova/compute/resolv.conf.template
deleted file mode 100644
index 7ddb55190..000000000
--- a/nova/compute/resolv.conf.template
+++ /dev/null
@@ -1 +0,0 @@
-nameserver ${dns}
diff --git a/nova/flags.py b/nova/flags.py
index 2b96a15f7..d2c22e46b 100644
--- a/nova/flags.py
+++ b/nova/flags.py
@@ -202,7 +202,8 @@ DEFINE_string('default_ramdisk', 'ari-11111',
 DEFINE_string('default_instance_type', 'm1.small',
               'default instance type to use, testing only')
 DEFINE_string('null_kernel', 'aki-00000000',
-                'kernel image that indicates not to use a kernel, to use a raw disk image instead')
+              'kernel image that indicates not to use a kernel, '
+              ' but to use a raw disk image instead')
 
 DEFINE_string('vpn_image_id', 'ami-CLOUDPIPE', 'AMI for cloudpipe vpn server')
 DEFINE_string('vpn_key_suffix',
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