Merge "Adopt oslo.log default_log_levels"

neutron/common/config.py

@@ -252,6 +252,9 @@ def setup_logging():
     """Sets up the logging options for a log with supplied name."""
     product_name = "neutron"
     logging.setup(cfg.CONF, product_name)
+    # We use the oslo.log default log levels and add only the extra levels
+    # that Neutron needs.
+    logging.set_defaults(default_log_levels=logging.get_default_log_levels())
     LOG.info(_LI("Logging enabled!"))
     LOG.info(_LI("%(prog)s version %(version)s"),
              {'prog': sys.argv[0],

neutron/tests/etc/neutron.conf

@@ -1,6 +1,6 @@
 [DEFAULT]
 # Show more verbose log output (sets INFO log level output)
-verbose = True
+default_log_levels = neutron=INFO
 
 # Show debugging output in logs (sets DEBUG log level output)
 debug = False