Merge lp:~gundlach/nova/lp666554 into lp:~hudson-openstack/nova/trunk

[Michael Gundlach]

Ryan_Lane's code to handle /etc/network not existing when we try to inject /etc/network/interfaces into an image.

[Vish Ishaya (vishvananda)]

lgtm

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

[OpenStack Infra (hudson-openstack)]

The attempt to merge lp:~gundlach/nova/lp666554 into lp:nova failed. Below is the output from the failed tests.

nova/compute/disk.py:169:1: W293 blank line contains whitespace

^
    JCR: Trailing whitespace is superfluous.
    FBM: Except when it occurs as part of a blank line (i.e. the line is
         nothing but whitespace). According to Python docs[1] a line with only
         whitespace is considered a blank line, and is to be ignored. However,
         matching a blank line to its indentation level avoids mistakenly
         terminating a multi-line statement (e.g. class declaration) when
         pasting code into the standard Python interpreter.

         [1] http://docs.python.org/reference/lexical_analysis.html#blank-lines

    The warning returned varies on whether the line itself is blank, for easier
    filtering for those who want to indent their blank lines.

    Okay: spam(1)
    W291: spam(1)\s
    W293: class Foo(object):\n \n bang = 12

[lp:~gundlach/nova/lp666554]

387. By Michael Gundlach on 2010-11-16

pep8

=== modified file 'nova/compute/disk.py'
--- nova/compute/disk.py	2010-10-31 00:05:31 +0000
+++ nova/compute/disk.py	2010-11-16 18:52:14 +0000
@@ -165,6 +165,11 @@
 
 @defer.inlineCallbacks
 def _inject_key_into_fs(key, fs, execute=None):
+    """Add the given public ssh key to root's authorized_keys.
+
+    key is an ssh key string.
+    fs is the path to the base of the filesystem into which to inject the key.
+    """
     sshdir = os.path.join(os.path.join(fs, 'root'), '.ssh')
     yield execute('sudo mkdir -p %s' % sshdir)  # existing dir doesn't matter
     yield execute('sudo chown root %s' % sshdir)
@@ -175,6 +180,13 @@
 
 @defer.inlineCallbacks
 def _inject_net_into_fs(net, fs, execute=None):
-    netfile = os.path.join(os.path.join(os.path.join(
-            fs, 'etc'), 'network'), 'interfaces')
+    """Inject /etc/network/interfaces into the filesystem rooted at fs.
+
+    net is the contents of /etc/network/interfaces.
+    """
+    netdir = os.path.join(os.path.join(fs, 'etc'), 'network')
+    yield execute('sudo mkdir -p %s' % netdir)  # existing dir doesn't matter
+    yield execute('sudo chown root:root %s' % netdir)
+    yield execute('sudo chmod 755 %s' % netdir)
+    netfile = os.path.join(netdir, 'interfaces')
     yield execute('sudo tee %s' % netfile, net)