Merge lp:~berendt/nova/fixing_713434 into lp:~hudson-openstack/nova/trunk
Proposed by
Christian Berendt
Status: | Merged |
---|---|
Approved by: | Devin Carlen |
Approved revision: | 652 |
Merged at revision: | 650 |
Proposed branch: | lp:~berendt/nova/fixing_713434 |
Merge into: | lp:~hudson-openstack/nova/trunk |
Diff against target: |
44 lines (+7/-1) 2 files modified
Authors (+1/-0) nova/network/linux_net.py (+6/-1) |
To merge this branch: | bzr merge lp:~berendt/nova/fixing_713434 |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Devin Carlen (community) | Approve | ||
Soren Hansen (community) | Approve | ||
Review via email: mp+48770@code.launchpad.net |
Description of the change
added new parameter --dhcp_domain to set the used domain by dnsmasq in /etc/nova/nova.conf
To post a comment you must log in.
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 linux_net. py:321: 1: E101 indentation contains mixed spaces and tabs
FLAGS.dhcp_ domain,
W191: if True:\n\treturn
nova/network/
^
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 linux_net. py:366: 1: W191 indentation contains tabs
E101: if a == 0:\n a = 1\n\tb = 1
nova/network/
' --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 linux_net. py:366: 1: E101 indentation contains mixed spaces and tabs
W191: if True:\n\treturn
nova/network/
' --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