diff --git a/neutron/agent/linux/keepalived.py b/neutron/agent/linux/keepalived.py index a0230eb76bf..65e935c8ff9 100644 --- a/neutron/agent/linux/keepalived.py +++ b/neutron/agent/linux/keepalived.py @@ -366,7 +366,7 @@ class KeepalivedManager(object): """ - def __init__(self, resource_id, config, process_monitor, conf_path='/tmp', + def __init__(self, resource_id, config, process_monitor, conf_path, namespace=None, throttle_restart_value=None): self.resource_id = resource_id self.config = config diff --git a/tox.ini b/tox.ini index 235720aa2cc..2272c81fc4b 100644 --- a/tox.ini +++ b/tox.ini @@ -164,11 +164,10 @@ local-check-factory = neutron.hacking.checks.factory [testenv:bandit] # B104: Possible binding to all interfaces -# B108: Probable insecure usage of temp file/directory # B111: Execute with run_as_root=True identified, possible security issue # B311: Standard pseudo-random generators are not suitable for security/cryptographic purpose deps = -r{toxinidir}/test-requirements.txt -commands = bandit -r neutron -x tests -n5 -s B104,B108,B111,B311 +commands = bandit -r neutron -x tests -n5 -s B104,B111,B311 [testenv:bashate] commands = bash -c "find {toxinidir} \