summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRodolfo Alonso Hernandez <ralonsoh@redhat.com>2023-01-19 20:11:09 +0100
committerRodolfo Alonso Hernandez <ralonsoh@redhat.com>2023-04-21 04:43:54 +0200
commita4fa664d919dc13cc5f865114e19b45583951215 (patch)
tree8384c983320b67ab23bb72022d51a78235eee0f1
parent41e13d6055d4a47cbd2ff01cfdbbfbe0087bd6e9 (diff)
downloadneutron-a4fa664d919dc13cc5f865114e19b45583951215.tar.gz
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 (cherry picked from commit 1a3bdff18abef093c0633bd39187f5a0e582535f)
-rw-r--r--neutron/agent/l3/keepalived_state_change.py1
-rw-r--r--neutron/tests/functional/agent/l3/test_keepalived_state_change.py4
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 eb0650b6cf..49d63a29fb 100644
--- a/neutron/agent/l3/keepalived_state_change.py
+++ b/neutron/agent/l3/keepalived_state_change.py
@@ -168,7 +168,6 @@ class MonitorDaemon(daemon.Daemon):
def configure(conf):
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 65ae136bb3..07f67ad77b 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():