diff options
| author | Borne Mace <borne.mace@oracle.com> | 2015-07-10 09:19:32 -0700 |
|---|---|---|
| committer | Borne Mace <borne.mace@oracle.com> | 2015-07-10 09:19:32 -0700 |
| commit | 5a758fc6d1e951e3fa7c4e1c54dae7e96595f6ab (patch) | |
| tree | 0019fd9b8597b8394741673650aa0b8e8efba8f1 /docker/centos | |
| parent | adc8bc11df20fef97f3da65d775c95995f08a0c3 (diff) | |
| download | kolla-5a758fc6d1e951e3fa7c4e1c54dae7e96595f6ab.tar.gz kolla-5a758fc6d1e951e3fa7c4e1c54dae7e96595f6ab.zip | |
Fixed all remaining pep8 failures in the codebase
Change-Id: I0de312a587ecd83158da4c7e05ca6495c7a981a8
Partially-Implements: blueprint enable-flake8
Diffstat (limited to 'docker/centos')
| -rwxr-xr-x | docker/centos/binary/neutron/neutron-base/ip_wrapper.py | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/docker/centos/binary/neutron/neutron-base/ip_wrapper.py b/docker/centos/binary/neutron/neutron-base/ip_wrapper.py index 99d70340e..94d54d4e0 100755 --- a/docker/centos/binary/neutron/neutron-base/ip_wrapper.py +++ b/docker/centos/binary/neutron/neutron-base/ip_wrapper.py @@ -14,9 +14,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file exists because we want to create and delete any network namespaces from the -# host mount namespace. This allows the host to access all of the neutron network -# namespaces as well as all containers that bind mount /run/netns from the host. +# This file exists because we want to create and delete any network +# namespaces from the host mount namespace. This allows the host to +# access all of the neutron network namespaces as well as all +# containers that bind mount /run/netns from the host. # This is required for "thin" neutron containers to function properly @@ -24,24 +25,32 @@ import sys import subprocess import nsenter + def host_mnt_exec(cmd): try: with nsenter.ExitStack() as stack: - stack.enter_context(nsenter.Namespace('1', 'mnt', proc='/opt/kolla/host_proc/')) + stack.enter_context( + nsenter.Namespace( + '1', + 'mnt', + proc='/opt/kolla/host_proc/')) process_ = subprocess.Popen(cmd) except Exception as e: - print("An error has occured with a component that Kolla manages. Please file a bug") + print( + "An error has occured with a component that Kolla manages." + " Please file a bug") print("Error: ", e) return process_ if len(sys.argv) > 2: - # We catch all commands that ip will accept that refer to creating or deleteing a - # Network namespace - if str(sys.argv[1]).startswith("net") and \ - (str(sys.argv[2]).startswith("a") or str(sys.argv[2]).startswith("d")): + # We catch all commands that ip will accept that refer + # to creating or deleteing a Network namespace + if str(sys.argv[1]).startswith("net") and ( + str(sys.argv[2]).startswith("a") or + str(sys.argv[2]).startswith("d")): # This cmd is executed in the host mount namespace cmd = ["/usr/bin/env", "ip"] + sys.argv[1:] sys.exit(host_mnt_exec(cmd).returncode) |
