Merge "Honor debug mode in keepalived-state-change script logs"

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)

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():