summaryrefslogtreecommitdiffstats
path: root/openstack/common
diff options
context:
space:
mode:
authorDirk Mueller <dirk@dmllr.de>2013-07-02 09:28:27 +0200
committerDirk Mueller <dirk@dmllr.de>2013-07-20 08:47:23 +0200
commit3b16d3144531ef6802c3ff621b4e96497df7d392 (patch)
treef8c2f162d82811162d1afcea019e077aeb0d63ec /openstack/common
parent3c69baf5c8db4b98df93c8ef5702d7df095d69ff (diff)
downloadoslo-3b16d3144531ef6802c3ff621b4e96497df7d392.tar.gz
oslo-3b16d3144531ef6802c3ff621b4e96497df7d392.tar.xz
oslo-3b16d3144531ef6802c3ff621b4e96497df7d392.zip
Remove DnsmasqFilter and DeprecatedDnsmasqFilter
EnvFilter supersedes both, so remove them as all usages have been converted to EnvFilter. Change-Id: I5acb0c924815caae1f96ed2fa6ee8b1f7ed93cf4
Diffstat (limited to 'openstack/common')
-rw-r--r--openstack/common/rootwrap/filters.py30
1 files changed, 0 insertions, 30 deletions
diff --git a/openstack/common/rootwrap/filters.py b/openstack/common/rootwrap/filters.py
index 660434a..a68a043 100644
--- a/openstack/common/rootwrap/filters.py
+++ b/openstack/common/rootwrap/filters.py
@@ -135,36 +135,6 @@ class PathFilter(CommandFilter):
exec_dirs)
-class DnsmasqFilter(CommandFilter):
- """Specific filter for the dnsmasq call (which includes env)."""
-
- CONFIG_FILE_ARG = 'CONFIG_FILE'
-
- def match(self, userargs):
- if (userargs[0] == 'env' and
- userargs[1].startswith(self.CONFIG_FILE_ARG) and
- userargs[2].startswith('NETWORK_ID=') and
- userargs[3] == 'dnsmasq'):
- return True
- return False
-
- def get_command(self, userargs, exec_dirs=[]):
- to_exec = self.get_exec(exec_dirs=exec_dirs) or self.exec_path
- dnsmasq_pos = userargs.index('dnsmasq')
- return [to_exec] + userargs[dnsmasq_pos + 1:]
-
- def get_environment(self, userargs):
- env = os.environ.copy()
- env[self.CONFIG_FILE_ARG] = userargs[1].split('=')[-1]
- env['NETWORK_ID'] = userargs[2].split('=')[-1]
- return env
-
-
-class DeprecatedDnsmasqFilter(DnsmasqFilter):
- """Variant of dnsmasq filter to support old-style FLAGFILE."""
- CONFIG_FILE_ARG = 'FLAGFILE'
-
-
class KillFilter(CommandFilter):
"""Specific filter for the kill calls.