rgw: enable rgw_ops_log_file_path by default

Signed-off-by: Casey Bodley <cbodley@redhat.com>

diff --git a/src/common/options/rgw.yaml.in b/src/common/options/rgw.yaml.in
index a1a3cc9c3f5499d9cbd4fb1dc31798c9b75f9027..a378c71ac877a35d75241a8ba42e884612abbbda 100644 (file)
--- a/src/common/options/rgw.yaml.in
+++ b/src/common/options/rgw.yaml.in
@@ -1480,8 +1480,10 @@ options:
   type: str
   level: advanced
   desc: File-system path for ops log.
-  long_desc: Path to file that RGW will log ops logs to.
+  long_desc: Path to file that RGW will log ops logs to. A cephadm deployment will automatically
+    rotate these logs under /var/log/ceph/. Other deployments should arrange for similar log rotation.
   fmt_desc: The file-system path for writing operations logs.
+  daemon_default: /var/log/ceph/ops-log-$cluster-$name.log
   services:
   - rgw
   see_also:

diff --git a/src/test/cli/ceph-conf/show-config.t b/src/test/cli/ceph-conf/show-config.t
index cfd723997c87465f52e6e0db2ad960259c02066b..45405e4b7a0798d37e2ae70f2be5489afa306a4d 100644 (file)
--- a/src/test/cli/ceph-conf/show-config.t
+++ b/src/test/cli/ceph-conf/show-config.t
@@ -2,5 +2,6 @@
   admin_socket = /var/run/ceph/ceph-osd.0.asok
   log_file = /var/log/ceph/ceph-osd.0.log
   mon_debug_dump_location = /var/log/ceph/ceph-osd.0.tdump
+  rgw_ops_log_file_path = /var/log/ceph/ops-log-ceph-osd.0.log
   $ CEPH_ARGS="--fsid 96a3abe6-7552-4635-a79b-f3c096ff8b95" ceph-conf -n osd.0 --show-config -c /dev/null | grep fsid
   fsid = 96a3abe6-7552-4635-a79b-f3c096ff8b95