]> review.fuel-infra Code Review - openstack-build/neutron-build.git/commit
Import Oslo's common rootwrap to Neutron
authorThierry Carrez <thierry@openstack.org>
Thu, 27 Jun 2013 13:19:05 +0000 (15:19 +0200)
committerThierry Carrez <thierry@openstack.org>
Mon, 8 Jul 2013 16:25:44 +0000 (18:25 +0200)
commit042d15a314de2406a5a34b83c8cee14e3238944a
tree9395b76c679d25ca0cb40b2af74a7ddcd26504da
parent93efc1dd78c4e97bb7c8e191115be98f9383b40c
Import Oslo's common rootwrap to Neutron

Use the common oslo-incubator rootwrap rather than maintain a
specific fork within Neutron.

- Migrated DnsmasqFilter use in dhcp.filters to the new EnvFilter
- Changed environment passing in ip_lib's netns.execute so that
  it can be properly matched using IpNetNsExecFilter + EnvFilter.
  It now calls "ip netns exec ns env A=B C=D command" instead of
  "A=B C=D ip netns exec ns command". Adjusted tests accordingly.

All the other changes are coming directly from the Oslo "rootwrap"
module sync.

Notes:
- Neutron locates its rootwrap.conf in etc/ rather than in etc/neutron
- Neutron maintains a specific bin/quantum-rootwrap-xen-dom0 which
  requires additional config in rootwrap.conf

Both behaviors were preserved in this commit, but this may need to be
addressed in the future to simplify future oslo-rootwrap updates.

Implements bp: quantum-common-rootwrap

Change-Id: I02879942a9d1169a71aa4d684c1b9ec109a6de32
13 files changed:
bin/neutron-rootwrap
bin/quantum-rootwrap
bin/quantum-rootwrap-xen-dom0
etc/neutron/rootwrap.d/dhcp.filters
etc/rootwrap.conf
neutron/agent/linux/ip_lib.py
neutron/openstack/common/rootwrap/__init__.py [moved from neutron/rootwrap/__init__.py with 93% similarity]
neutron/openstack/common/rootwrap/cmd.py [new file with mode: 0755]
neutron/openstack/common/rootwrap/filters.py [moved from neutron/rootwrap/filters.py with 65% similarity]
neutron/openstack/common/rootwrap/wrapper.py [moved from neutron/rootwrap/wrapper.py with 89% similarity]
neutron/tests/unit/test_linux_dhcp.py
neutron/tests/unit/test_linux_ip_lib.py
neutron/tests/unit/test_rootwrap.py [deleted file]