Merge lp:~berendt/nova/fixing_713434 into lp:~hudson-openstack/nova/trunk

[Christian Berendt]

added new parameter --dhcp_domain to set the used domain by dnsmasq in /etc/nova/nova.conf

[Soren Hansen (soren)]

From pep8:

nova/network/linux_net.py:321:1: W191 indentation contains tabs
       FLAGS.dhcp_domain,
^
    For new projects, spaces-only are strongly recommended over tabs. Most
    editors have features that make this easy to do.

    Okay: if True:\n return
    W191: if True:\n\treturn
nova/network/linux_net.py:321:1: E101 indentation contains mixed spaces and tabs
       FLAGS.dhcp_domain,
^
    Never mix tabs and spaces.

    The most popular way of indenting Python is with spaces only. The
    second-most popular way is with tabs only. Code indented with a mixture
    of tabs and spaces should be converted to using spaces exclusively. When
    invoking the Python command line interpreter with the -t option, it issues
    warnings about code that illegally mixes tabs and spaces. When using -tt
    these warnings become errors. These options are highly recommended!

    Okay: if a == 0:\n a = 1\n b = 1
    E101: if a == 0:\n a = 1\n\tb = 1
nova/network/linux_net.py:366:1: W191 indentation contains tabs
    ' --domain=%s' % FLAGS.dhcp_domain,
^
    For new projects, spaces-only are strongly recommended over tabs. Most
    editors have features that make this easy to do.

    Okay: if True:\n return
    W191: if True:\n\treturn
nova/network/linux_net.py:366:1: E101 indentation contains mixed spaces and tabs
    ' --domain=%s' % FLAGS.dhcp_domain,
^
    Never mix tabs and spaces.

    The most popular way of indenting Python is with spaces only. The
    second-most popular way is with tabs only. Code indented with a mixture
    of tabs and spaces should be converted to using spaces exclusively. When
    invoking the Python command line interpreter with the -t option, it issues
    warnings about code that illegally mixes tabs and spaces. When using -tt
    these warnings become errors. These options are highly recommended!

    Okay: if a == 0:\n a = 1\n b = 1
    E101: if a == 0:\n a = 1\n\tb = 1

review: Needs Fixing

[lp:~berendt/nova/fixing_713434]

652. By Christian Berendt on 2011-02-07

fixed format according to PEP8

[Soren Hansen (soren)]

lgtm, thanks!

review: Approve

[Devin Carlen (devcamcar)]

lgtm

review: Approve

=== modified file 'Authors'
--- Authors	2011-02-04 10:48:45 +0000
+++ Authors	2011-02-07 14:22:16 +0000
@@ -6,6 +6,7 @@
 Chiradeep Vittal <[e-mail]>
 Chmouel Boudjnah <[e-mail]>
 Chris Behrens <[e-mail]>
+Christian Berendt <[e-mail]>
 Cory Wright <[e-mail]>
 David Pravec <[e-mail]>
 Dan Prince <[e-mail]>

=== modified file 'nova/network/linux_net.py'
--- nova/network/linux_net.py	2011-01-26 12:10:51 +0000
+++ nova/network/linux_net.py	2011-02-07 14:22:16 +0000
@@ -37,6 +37,9 @@
 flags.DEFINE_string('dhcpbridge_flagfile',
                     '/etc/nova/nova-dhcpbridge.conf',
                     'location of flagfile for dhcpbridge')
+flags.DEFINE_string('dhcp_domain',
+                    'novalocal',
+                    'domain to use for building the hostnames')
 
 flags.DEFINE_string('networks_path', '$state_path/networks',
                     'Location to keep network config files')
@@ -313,8 +316,9 @@
 def _host_dhcp(fixed_ip_ref):
     """Return a host string for an address"""
     instance_ref = fixed_ip_ref['instance']
-    return "%s,%s.novalocal,%s" % (instance_ref['mac_address'],
+    return "%s,%s.%s,%s" % (instance_ref['mac_address'],
                                    instance_ref['hostname'],
+                                   FLAGS.dhcp_domain,
                                    fixed_ip_ref['address'])
 
 
@@ -359,6 +363,7 @@
            ' --strict-order',
            ' --bind-interfaces',
            ' --conf-file=',
+           ' --domain=%s' % FLAGS.dhcp_domain,
            ' --pid-file=%s' % _dhcp_file(net['bridge'], 'pid'),
            ' --listen-address=%s' % net['gateway'],
            ' --except-interface=lo',