From: Patrick Donnelly Date: Fri, 4 Sep 2020 03:33:01 +0000 (-0700) Subject: qa: move log-rotate config to common yaml X-Git-Tag: v16.1.0~689^2~37 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=49abce22909f1f378034e06ea0b83ef063b38989;p=ceph.git qa: move log-rotate config to common yaml Fixes: https://tracker.ceph.com/issues/23718 Signed-off-by: Patrick Donnelly --- diff --git a/qa/cephfs/begin.yaml b/qa/cephfs/begin.yaml index 56156886c1f6..082f29540670 100644 --- 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 5fcb3d571c75..d295dc3d37ec 100644 --- 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 437a384752ab..d7701815f654 100644 --- 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 ac3c00d4d338..5ce128cbd600 100644 --- 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 d78bc7accee4..6e996244e21e 100644 --- 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 b78d42209e91..200df1fe0caa 100644 --- 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 dca03d76228c..3e2ee78703f2 100644 --- 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 70dd6813ab1f..9addfe3b041c 100644 --- 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 2b36c9d82399..87867daa4a4e 100644 --- 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 4be15ea161ba..ba17f05d2b2c 100644 --- 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 edfec5e19a37..8dfacb4e7d6b 100644 --- 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 fd69e32bcea7..60b18c251d7a 100644 --- 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 f55f031ae5f2..dff37a51fe32 100644 --- 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 index 3b876f13b6ad..000000000000 --- 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 index d955aa5ba867..000000000000 --- 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 index d955aa5ba867..000000000000 --- 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 index d955aa5ba867..000000000000 --- 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 index d955aa5ba867..000000000000 --- 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 index d955aa5ba867..000000000000 --- 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