From 1a3bdff18abef093c0633bd39187f5a0e582535f Mon Sep 17 00:00:00 2001 From: Rodolfo Alonso Hernandez Date: Thu, 19 Jan 2023 20:11:09 +0100 Subject: [PATCH] Honor debug mode in keepalived-state-change script logs This patch removes the config option "debug" override done during the script initialization. Closes-Bug: #2003534 Change-Id: I403d73a1f35cb6314c814f25628a83d3e111e0fe --- neutron/agent/l3/keepalived_state_change.py | 1 - .../tests/functional/agent/l3/test_keepalived_state_change.py | 4 +++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/neutron/agent/l3/keepalived_state_change.py b/neutron/agent/l3/keepalived_state_change.py index 9bb97696fea..e495a417ab9 100644 --- a/neutron/agent/l3/keepalived_state_change.py +++ b/neutron/agent/l3/keepalived_state_change.py @@ -169,7 +169,6 @@ def configure(conf): config.register_common_config_options() config.init(sys.argv[1:]) conf.set_override('log_dir', cfg.CONF.conf_dir) - conf.set_override('debug', True) conf.set_override('use_syslog', True) config.setup_logging() privileged.default.set_client_mode(False) diff --git a/neutron/tests/functional/agent/l3/test_keepalived_state_change.py b/neutron/tests/functional/agent/l3/test_keepalived_state_change.py index 7eec79aaf3f..60b4451436c 100644 --- a/neutron/tests/functional/agent/l3/test_keepalived_state_change.py +++ b/neutron/tests/functional/agent/l3/test_keepalived_state_change.py @@ -85,7 +85,9 @@ class TestMonitorDaemon(base.BaseLoggingTestCase): '--pid_file=%s' % self.pid_file, '--state_path=%s' % self.conf_dir, '--user=%s' % os.geteuid(), - '--group=%s' % os.getegid()] + '--group=%s' % os.getegid(), + '--debug', + ] def _search_in_file(self, file_name, text): def text_in_file():