From: Sage Weil <sage@redhat.com>
Date: Tue, 25 Feb 2020 19:23:21 +0000 (-0600)
Subject: mgr/cephadm: log to cluster channel by default
X-Git-Tag: v15.1.1~212^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=b87e14555d85aac6e8a987331a05f730e8f54f0f;p=ceph.git

mgr/cephadm: log to cluster channel by default

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/pybind/mgr/cephadm/module.py b/src/pybind/mgr/cephadm/module.py
index 51e5e2f7d4dd..4ccf7b6f6868 100644
--- a/src/pybind/mgr/cephadm/module.py
+++ b/src/pybind/mgr/cephadm/module.py
@@ -501,6 +501,12 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
             'default': True,
             'desc': 'raise a health warning if the host check fails',
         },
+        {
+            'name': 'log_to_cluster',
+            'type': 'bool',
+            'default': True,
+            'desc': 'log to the "cephadm" cluster log channel"',
+        },
     ]
 
     def __init__(self, *args, **kwargs):
@@ -991,6 +997,7 @@ class CephadmOrchestrator(orchestrator.Orchestrator, MgrModule):
                     opt,  # type: ignore
                     self.get_ceph_option(opt))
             self.log.debug(' native option %s = %s', opt, getattr(self, opt))  # type: ignore
+
         self.event.set()
 
     def notify(self, notify_type, notify_id):