Merge "Set neutron client logging to INFO"

octavia/common/config.py

@@ -36,10 +36,13 @@ from octavia import version
 
 LOG = logging.getLogger(__name__)
 
+EXTRA_LOG_LEVEL_DEFAULTS = [
+    'neutronclient.v2_0.client=INFO',
+]
+
 TLS_PROTOCOL_CHOICES = [
     p[9:].replace('_', '.') for p in ssl._PROTOCOL_NAMES.values()]
 
-
 core_opts = [
     cfg.HostnameOpt('host', default=utils.get_hostname(),
                     help=_("The hostname Octavia is running on")),
@@ -765,6 +768,8 @@ def setup_logging(conf):
 
     :param conf: a cfg.ConfOpts object
     """
+    logging.set_defaults(default_log_levels=logging.get_default_log_levels() +
+                         EXTRA_LOG_LEVEL_DEFAULTS)
     product_name = "octavia"
     logging.setup(conf, product_name)
     LOG.info("Logging enabled!")

octavia/common/service.py

@@ -13,7 +13,6 @@
 #    under the License.
 
 from oslo_config import cfg
-from oslo_log import log
 
 from octavia.common import config
 from octavia.common import rpc
@@ -23,6 +22,5 @@ def prepare_service(argv=None):
     """Sets global config from config file and sets up logging."""
     argv = argv or []
     config.init(argv[1:])
-    log.set_defaults()
     config.setup_logging(cfg.CONF)
     rpc.init()