diff --git a/neutron/agent/linux/external_process.py b/neutron/agent/linux/external_process.py index b9d581210a..ffea1247ac 100644 --- a/neutron/agent/linux/external_process.py +++ b/neutron/agent/linux/external_process.py @@ -30,14 +30,12 @@ OPTS = [ cfg.StrOpt('external_pids', default='$state_path/external/pids', help=_('Location to store child pid files')), - cfg.BoolOpt('check_child_processes', default=False, - help=_("Periodically check child processes")), cfg.StrOpt('check_child_processes_action', default='respawn', choices=['respawn', 'exit'], help=_('Action to be executed when a child process dies')), - cfg.IntOpt('check_child_processes_interval', default=60, + cfg.IntOpt('check_child_processes_interval', default=0, help=_('Interval between checks of child process liveness ' - '(seconds)')), + '(seconds), use 0 to disable')), ] @@ -156,7 +154,7 @@ class ProcessMonitor(object): self._process_managers = {} - if self._config.check_child_processes: + if self._config.check_child_processes_interval: self._spawn_checking_thread() def enable(self, uuid, cmd_callback, namespace=None, service=None, diff --git a/neutron/tests/functional/agent/linux/test_process_monitor.py b/neutron/tests/functional/agent/linux/test_process_monitor.py index 8327a38b1e..4d3b69d279 100644 --- a/neutron/tests/functional/agent/linux/test_process_monitor.py +++ b/neutron/tests/functional/agent/linux/test_process_monitor.py @@ -29,7 +29,6 @@ class BaseTestProcessMonitor(base.BaseSudoTestCase): def setUp(self): super(BaseTestProcessMonitor, self).setUp() self._exit_handler_called = False - cfg.CONF.set_override('check_child_processes', True) cfg.CONF.set_override('check_child_processes_interval', 1) self._child_processes = [] self._ext_processes = None