qa: move log-rotate config to common yaml

Fixes: https://tracker.ceph.com/issues/23718
Signed-off-by: Patrick Donnelly <pdonnell@redhat.com>

diff --git a/qa/cephfs/begin.yaml b/qa/cephfs/begin.yaml
index 56156886c1f6825ce622249da47225fa82c50f42..082f295406700c0380fdeaea7e5e1a4ed1756266 100644 (file)
--- a/qa/cephfs/begin.yaml
+++ b/qa/cephfs/begin.yaml
@@ -1,3 +1,6 @@
+log-rotate:
+  ceph-mds: 10G
+  ceph-osd: 10G
 tasks:
   - install:
       extra_packages:

diff --git a/qa/cephfs/clusters/1-mds-1-client-coloc.yaml b/qa/cephfs/clusters/1-mds-1-client-coloc.yaml
index 5fcb3d571c7535a01f579b3d20206edbfc6b8c25..d295dc3d37eceb1817b1a0ee088bf479ff719b53 100644 (file)
--- a/qa/cephfs/clusters/1-mds-1-client-coloc.yaml
+++ b/qa/cephfs/clusters/1-mds-1-client-coloc.yaml
@@ -7,6 +7,3 @@ openstack:
     size: 20 # GB
 - machine:
     disk: 200 # GB
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G

diff --git a/qa/cephfs/clusters/1-mds-1-client.yaml b/qa/cephfs/clusters/1-mds-1-client.yaml
index 437a384752ab7eb0c67dbde7a1e2f6b443a1e2ba..d7701815f6549462da548a070877a18192cb768c 100644 (file)
--- a/qa/cephfs/clusters/1-mds-1-client.yaml
+++ b/qa/cephfs/clusters/1-mds-1-client.yaml
@@ -8,6 +8,3 @@ openstack:
     size: 20 # GB
 - machine:
     disk: 200 # GB
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G

diff --git a/qa/cephfs/clusters/1-mds-2-client-coloc.yaml b/qa/cephfs/clusters/1-mds-2-client-coloc.yaml
index ac3c00d4d338ec1bf03ffa3850d838377a99b911..5ce128cbd600be446cba5e9f338c663baafa95a9 100644 (file)
--- a/qa/cephfs/clusters/1-mds-2-client-coloc.yaml
+++ b/qa/cephfs/clusters/1-mds-2-client-coloc.yaml
@@ -7,6 +7,3 @@ openstack:
     size: 20 # GB
 - machine:
     disk: 200 # GB
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G

diff --git a/qa/cephfs/clusters/1-mds-2-client.yaml b/qa/cephfs/clusters/1-mds-2-client.yaml
index d78bc7accee428c6b9fd5d4f01a1c6d40c93c4db..6e996244e21e8d16df4f15d6b6da56e03a76a38b 100644 (file)
--- a/qa/cephfs/clusters/1-mds-2-client.yaml
+++ b/qa/cephfs/clusters/1-mds-2-client.yaml
@@ -9,6 +9,3 @@ openstack:
     size: 30 # GB
 - machine:
     disk: 200 # GB
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G

diff --git a/qa/cephfs/clusters/1-mds-3-client.yaml b/qa/cephfs/clusters/1-mds-3-client.yaml
index b78d42209e9107637d11d0c44387ce44da7df179..200df1fe0caa68a239410bee0caaf10c857b5d3b 100644 (file)
--- a/qa/cephfs/clusters/1-mds-3-client.yaml
+++ b/qa/cephfs/clusters/1-mds-3-client.yaml
@@ -10,6 +10,3 @@ openstack:
     size: 30 # GB
 - machine:
     disk: 200 # GB
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G

diff --git a/qa/cephfs/clusters/1-mds-4-client-coloc.yaml b/qa/cephfs/clusters/1-mds-4-client-coloc.yaml
index dca03d76228c6540c90a7552beb02330a989161f..3e2ee78703f2d82c158e90660241a4dda4d17924 100644 (file)
--- a/qa/cephfs/clusters/1-mds-4-client-coloc.yaml
+++ b/qa/cephfs/clusters/1-mds-4-client-coloc.yaml
@@ -7,6 +7,3 @@ openstack:
     size: 30 # GB
 - machine:
     disk: 200 # GB
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G

diff --git a/qa/cephfs/clusters/1-mds-4-client.yaml b/qa/cephfs/clusters/1-mds-4-client.yaml
index 70dd6813ab1ff1121b8835beaace659e6a3352a4..9addfe3b041c93fe7ae2888948b1366de75c57b6 100644 (file)
--- a/qa/cephfs/clusters/1-mds-4-client.yaml
+++ b/qa/cephfs/clusters/1-mds-4-client.yaml
@@ -11,6 +11,3 @@ openstack:
     size: 30 # GB
 - machine:
     disk: 200 # GB
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G

diff --git a/qa/cephfs/clusters/1a3s-mds-1c-client.yaml b/qa/cephfs/clusters/1a3s-mds-1c-client.yaml
index 2b36c9d82399f68dc7be41d0218be5f0055e3075..87867daa4a4ec33d1fdfe7fc6a95280369eda346 100644 (file)
--- a/qa/cephfs/clusters/1a3s-mds-1c-client.yaml
+++ b/qa/cephfs/clusters/1a3s-mds-1c-client.yaml
@@ -7,6 +7,3 @@ openstack:
     size: 20 # GB
 - machine:
     disk: 200 # GB
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G

diff --git a/qa/cephfs/clusters/1a3s-mds-2c-client.yaml b/qa/cephfs/clusters/1a3s-mds-2c-client.yaml
index 4be15ea161ba98d5aafac5054ed30e42469e58e4..ba17f05d2b2cc7aec71cc8720d70ccfed5a3cdfc 100644 (file)
--- a/qa/cephfs/clusters/1a3s-mds-2c-client.yaml
+++ b/qa/cephfs/clusters/1a3s-mds-2c-client.yaml
@@ -7,6 +7,3 @@ openstack:
     size: 20 # GB
 - machine:
     disk: 200 # GB
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G

diff --git a/qa/cephfs/clusters/3-mds.yaml b/qa/cephfs/clusters/3-mds.yaml
index edfec5e19a375e4fe791370509ebc4f8191d7e84..8dfacb4e7d6b32fd8b3f1a84b118ce9215c04591 100644 (file)
--- a/qa/cephfs/clusters/3-mds.yaml
+++ b/qa/cephfs/clusters/3-mds.yaml
@@ -12,6 +12,3 @@ openstack:
     size: 30 # GB
 - machine:
     disk: 200 # GB
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G

diff --git a/qa/cephfs/clusters/9-mds.yaml b/qa/cephfs/clusters/9-mds.yaml
index fd69e32bcea70c0cf3632638886cd22fa63e0217..60b18c251d7a2eb3d7c3eccc4eb6e1e4769bb919 100644 (file)
--- a/qa/cephfs/clusters/9-mds.yaml
+++ b/qa/cephfs/clusters/9-mds.yaml
@@ -12,6 +12,3 @@ openstack:
     size: 30 # GB
 - machine:
     disk: 200 # GB
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G

diff --git a/qa/cephfs/clusters/fixed-2-ucephfs.yaml b/qa/cephfs/clusters/fixed-2-ucephfs.yaml
index f55f031ae5f2ab5f06aa25943c12528c8f13096e..dff37a51fe32409d618f5f37a4f4770b4a06708d 100644 (file)
--- a/qa/cephfs/clusters/fixed-2-ucephfs.yaml
+++ b/qa/cephfs/clusters/fixed-2-ucephfs.yaml
@@ -7,6 +7,3 @@ openstack:
     size: 30 # GB
 - machine:
     disk: 200 # GB
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G

diff --git a/qa/cephfs/overrides/log-config.yaml b/qa/cephfs/overrides/log-config.yaml
deleted file mode 100644 (file)
index 3b876f1..0000000
--- a/qa/cephfs/overrides/log-config.yaml
+++ /dev/null
@@ -1,3 +0,0 @@
-log-rotate:
-  ceph-mds: 10G
-  ceph-osd: 10G

diff --git a/qa/suites/kcephfs/cephfs/overrides/log-config.yaml b/qa/suites/kcephfs/cephfs/overrides/log-config.yaml
deleted file mode 120000 (symlink)
index d955aa5..0000000
--- a/qa/suites/kcephfs/cephfs/overrides/log-config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/log-config.yaml
\ No newline at end of file

diff --git a/qa/suites/kcephfs/mixed-clients/overrides/log-config.yaml b/qa/suites/kcephfs/mixed-clients/overrides/log-config.yaml
deleted file mode 120000 (symlink)
index d955aa5..0000000
--- a/qa/suites/kcephfs/mixed-clients/overrides/log-config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/log-config.yaml
\ No newline at end of file

diff --git a/qa/suites/kcephfs/multifs/overrides/log-config.yaml b/qa/suites/kcephfs/multifs/overrides/log-config.yaml
deleted file mode 120000 (symlink)
index d955aa5..0000000
--- a/qa/suites/kcephfs/multifs/overrides/log-config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/log-config.yaml
\ No newline at end of file

diff --git a/qa/suites/kcephfs/recovery/overrides/log-config.yaml b/qa/suites/kcephfs/recovery/overrides/log-config.yaml
deleted file mode 120000 (symlink)
index d955aa5..0000000
--- a/qa/suites/kcephfs/recovery/overrides/log-config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/log-config.yaml
\ No newline at end of file

diff --git a/qa/suites/kcephfs/thrash/overrides/log-config.yaml b/qa/suites/kcephfs/thrash/overrides/log-config.yaml
deleted file mode 120000 (symlink)
index d955aa5..0000000
--- a/qa/suites/kcephfs/thrash/overrides/log-config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-.qa/cephfs/overrides/log-config.yaml
\ No newline at end of file