diff --git a/tests/functional/all_daemons/container/ceph-override.json b/tests/functional/all_daemons/container/ceph-override.json deleted file mode 100644 index cce7e62e8..000000000 --- a/tests/functional/all_daemons/container/ceph-override.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "ceph_conf_overrides": { - "global": { - "osd_pool_default_pg_num": 12, - "osd_pool_default_size": 1 - } - }, - "cephfs_pools": [ - { - "name": "cephfs_metadata", - "pgs": 8, - "size": 1 - }, - { - "name": "cephfs_data", - "pgs": 8, - "size": 1 - } - ], - "ceph_mon_docker_memory_limit": "2g" -} diff --git a/tests/functional/all_daemons/container/ceph-override.json b/tests/functional/all_daemons/container/ceph-override.json new file mode 120000 index 000000000..772bdc5f5 --- /dev/null +++ b/tests/functional/all_daemons/container/ceph-override.json @@ -0,0 +1 @@ +../ceph-override.json \ No newline at end of file diff --git a/tests/functional/lvm-batch/ceph-override.json b/tests/functional/lvm-batch/ceph-override.json deleted file mode 100644 index 1a9600a14..000000000 --- a/tests/functional/lvm-batch/ceph-override.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ceph_conf_overrides": { - "global": { - "osd_pool_default_pg_num": 12, - "osd_pool_default_size": 1 - } - }, - "ceph_mon_docker_memory_limit": "2g" -} diff --git a/tests/functional/lvm-batch/ceph-override.json b/tests/functional/lvm-batch/ceph-override.json new file mode 120000 index 000000000..fe2ff40d6 --- /dev/null +++ b/tests/functional/lvm-batch/ceph-override.json @@ -0,0 +1 @@ +../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/lvm-batch/container/ceph-override.json b/tests/functional/lvm-batch/container/ceph-override.json deleted file mode 100644 index 1a9600a14..000000000 --- a/tests/functional/lvm-batch/container/ceph-override.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ceph_conf_overrides": { - "global": { - "osd_pool_default_pg_num": 12, - "osd_pool_default_size": 1 - } - }, - "ceph_mon_docker_memory_limit": "2g" -} diff --git a/tests/functional/lvm-batch/container/ceph-override.json b/tests/functional/lvm-batch/container/ceph-override.json new file mode 120000 index 000000000..8417cc0c9 --- /dev/null +++ b/tests/functional/lvm-batch/container/ceph-override.json @@ -0,0 +1 @@ +../../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/shrink_mon/ceph-override.json b/tests/functional/shrink_mon/ceph-override.json deleted file mode 100644 index 1a9600a14..000000000 --- a/tests/functional/shrink_mon/ceph-override.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ceph_conf_overrides": { - "global": { - "osd_pool_default_pg_num": 12, - "osd_pool_default_size": 1 - } - }, - "ceph_mon_docker_memory_limit": "2g" -} diff --git a/tests/functional/shrink_mon/ceph-override.json b/tests/functional/shrink_mon/ceph-override.json new file mode 120000 index 000000000..fe2ff40d6 --- /dev/null +++ b/tests/functional/shrink_mon/ceph-override.json @@ -0,0 +1 @@ +../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/shrink_mon/container/ceph-override.json b/tests/functional/shrink_mon/container/ceph-override.json deleted file mode 100644 index cce7e62e8..000000000 --- a/tests/functional/shrink_mon/container/ceph-override.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "ceph_conf_overrides": { - "global": { - "osd_pool_default_pg_num": 12, - "osd_pool_default_size": 1 - } - }, - "cephfs_pools": [ - { - "name": "cephfs_metadata", - "pgs": 8, - "size": 1 - }, - { - "name": "cephfs_data", - "pgs": 8, - "size": 1 - } - ], - "ceph_mon_docker_memory_limit": "2g" -} diff --git a/tests/functional/shrink_mon/container/ceph-override.json b/tests/functional/shrink_mon/container/ceph-override.json new file mode 120000 index 000000000..8417cc0c9 --- /dev/null +++ b/tests/functional/shrink_mon/container/ceph-override.json @@ -0,0 +1 @@ +../../all_daemons/ceph-override.json \ No newline at end of file diff --git a/tests/functional/shrink_osd/ceph-override.json b/tests/functional/shrink_osd/ceph-override.json deleted file mode 100644 index 1a9600a14..000000000 --- a/tests/functional/shrink_osd/ceph-override.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ceph_conf_overrides": { - "global": { - "osd_pool_default_pg_num": 12, - "osd_pool_default_size": 1 - } - }, - "ceph_mon_docker_memory_limit": "2g" -} diff --git a/tests/functional/shrink_osd/ceph-override.json b/tests/functional/shrink_osd/ceph-override.json new file mode 120000 index 000000000..fe2ff40d6 --- /dev/null +++ b/tests/functional/shrink_osd/ceph-override.json @@ -0,0 +1 @@ +../all_daemons/ceph-override.json \ No newline at end of file