x/python-ganttclient
Code Issues Proposed changes

Addtional CommandFilters to fix rootwrap on SLES

Browse Source 
Fixes bug 1013147 (for SLES)

Change-Id: Ib362c913b809f7601a9a4faedede89b22794dfb7
This commit is contained in:
Ralf Haferkamp
2012-06-20 11:28:22 +02:00
parent 3d3eb4336d
commit 187d6f7a3b
3 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Authors
View File

@@ -173,6 +173,7 @@ Paul McMillan <paul.mcmillan@nebula.com>
Paul Voccio <paul@openstack.org> Paul Voccio <paul@openstack.org>
Peng Yong <ppyy@pubyun.com> Peng Yong <ppyy@pubyun.com>
Philip Knouff <philip.knouff@mailtrust.com> Philip Knouff <philip.knouff@mailtrust.com>
Ralf Haferkamp <rhafer@suse.de>
Renier Morales <renierm@us.ibm.com> Renier Morales <renierm@us.ibm.com>
Renuka Apte <renuka.apte@citrix.com> Renuka Apte <renuka.apte@citrix.com>
Ricardo Carrillo Cruz <emaildericky@gmail.com> Ricardo Carrillo Cruz <emaildericky@gmail.com>

7
nova/rootwrap/compute.py
View File

@@ -100,6 +100,7 @@ filterlist = [
# nova/virt/libvirt/vif.py: 'tunctl', '-b', '-t', dev # nova/virt/libvirt/vif.py: 'tunctl', '-b', '-t', dev
# nova/network/linux_net.py: 'tunctl', '-b', '-t', dev # nova/network/linux_net.py: 'tunctl', '-b', '-t', dev
filters.CommandFilter("/usr/sbin/tunctl", "root"), filters.CommandFilter("/usr/sbin/tunctl", "root"),
filters.CommandFilter("/bin/tunctl", "root"),
# nova/virt/libvirt/vif.py: 'ovs-vsctl', ... # nova/virt/libvirt/vif.py: 'ovs-vsctl', ...
# nova/virt/libvirt/vif.py: 'ovs-vsctl', 'del-port', ... # nova/virt/libvirt/vif.py: 'ovs-vsctl', 'del-port', ...
@@ -118,6 +119,7 @@ filterlist = [
# nova/virt/xenapi/vm_utils.py: "parted", "--script", ... # nova/virt/xenapi/vm_utils.py: "parted", "--script", ...
# nova/virt/xenapi/vm_utils.py: 'parted', '--script', dev_path, ..*. # nova/virt/xenapi/vm_utils.py: 'parted', '--script', dev_path, ..*.
filters.CommandFilter("/sbin/parted", "root"), filters.CommandFilter("/sbin/parted", "root"),
filters.CommandFilter("/usr/sbin/parted", "root"),
# nova/virt/xenapi/vm_utils.py: fdisk %(dev_path)s # nova/virt/xenapi/vm_utils.py: fdisk %(dev_path)s
filters.CommandFilter("/sbin/fdisk", "root"), filters.CommandFilter("/sbin/fdisk", "root"),
@@ -130,15 +132,20 @@ filterlist = [
# nova/network/linux_net.py: 'ip[6]tables-save' % (cmd,), '-t', ... # nova/network/linux_net.py: 'ip[6]tables-save' % (cmd,), '-t', ...
filters.CommandFilter("/sbin/iptables-save", "root"), filters.CommandFilter("/sbin/iptables-save", "root"),
filters.CommandFilter("/usr/sbin/iptables-save", "root"),
filters.CommandFilter("/sbin/ip6tables-save", "root"), filters.CommandFilter("/sbin/ip6tables-save", "root"),
filters.CommandFilter("/usr/sbin/ip6tables-save", "root"),
# nova/network/linux_net.py: 'ip[6]tables-restore' % (cmd,) # nova/network/linux_net.py: 'ip[6]tables-restore' % (cmd,)
filters.CommandFilter("/sbin/iptables-restore", "root"), filters.CommandFilter("/sbin/iptables-restore", "root"),
filters.CommandFilter("/usr/sbin/iptables-restore", "root"),
filters.CommandFilter("/sbin/ip6tables-restore", "root"), filters.CommandFilter("/sbin/ip6tables-restore", "root"),
filters.CommandFilter("/usr/sbin/ip6tables-restore", "root"),
# nova/network/linux_net.py: 'arping', '-U', floating_ip, '-A', '-I', ... # nova/network/linux_net.py: 'arping', '-U', floating_ip, '-A', '-I', ...
# nova/network/linux_net.py: 'arping', '-U', network_ref['dhcp_server'],.. # nova/network/linux_net.py: 'arping', '-U', network_ref['dhcp_server'],..
filters.CommandFilter("/usr/bin/arping", "root"), filters.CommandFilter("/usr/bin/arping", "root"),
filters.CommandFilter("/sbin/arping", "root"),
# nova/network/linux_net.py: 'route', '-n' # nova/network/linux_net.py: 'route', '-n'
# nova/network/linux_net.py: 'route', 'del', 'default', 'gw' # nova/network/linux_net.py: 'route', 'del', 'default', 'gw'

5
nova/rootwrap/network.py
View File

@@ -40,15 +40,20 @@ filterlist = [
# nova/network/linux_net.py: 'ip[6]tables-save' % (cmd,), '-t', ... # nova/network/linux_net.py: 'ip[6]tables-save' % (cmd,), '-t', ...
filters.CommandFilter("/sbin/iptables-save", "root"), filters.CommandFilter("/sbin/iptables-save", "root"),
filters.CommandFilter("/usr/sbin/iptables-save", "root"),
filters.CommandFilter("/sbin/ip6tables-save", "root"), filters.CommandFilter("/sbin/ip6tables-save", "root"),
filters.CommandFilter("/usr/sbin/ip6tables-save", "root"),
# nova/network/linux_net.py: 'ip[6]tables-restore' % (cmd,) # nova/network/linux_net.py: 'ip[6]tables-restore' % (cmd,)
filters.CommandFilter("/sbin/iptables-restore", "root"), filters.CommandFilter("/sbin/iptables-restore", "root"),
filters.CommandFilter("/usr/sbin/iptables-restore", "root"),
filters.CommandFilter("/sbin/ip6tables-restore", "root"), filters.CommandFilter("/sbin/ip6tables-restore", "root"),
filters.CommandFilter("/usr/sbin/ip6tables-restore", "root"),
# nova/network/linux_net.py: 'arping', '-U', floating_ip, '-A', '-I', ... # nova/network/linux_net.py: 'arping', '-U', floating_ip, '-A', '-I', ...
# nova/network/linux_net.py: 'arping', '-U', network_ref['dhcp_server'],.. # nova/network/linux_net.py: 'arping', '-U', network_ref['dhcp_server'],..
filters.CommandFilter("/usr/bin/arping", "root"), filters.CommandFilter("/usr/bin/arping", "root"),
filters.CommandFilter("/sbin/arping", "root"),
# nova/network/linux_net.py: 'route', '-n' # nova/network/linux_net.py: 'route', '-n'
# nova/network/linux_net.py: 'route', 'del', 'default', 'gw' # nova/network/linux_net.py: 'route', 'del', 'default', 'gw'