tests/functional: use ceph-override.json symlink

We don't need to have multiple ceph-override.json copies. We
currently already have symlink to all_daemons/ceph-override.json so
we can do it for all scenarios.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>

diff --git a/tests/functional/all_daemons/container/ceph-override.json b/tests/functional/all_daemons/container/ceph-override.json
deleted file mode 100644 (file)
index cce7e62e8729543daf39af5382978338c28f6d93..0000000000000000000000000000000000000000
--- 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 (symlink)
index 0000000000000000000000000000000000000000..772bdc5f50c5c7dff3a40516e4ada09cfd7cc2df
--- /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-auto-discovery/ceph-override.json b/tests/functional/lvm-auto-discovery/ceph-override.json
deleted file mode 100644 (file)
index 1a9600a14d29286f5edf5c8f500a3b7f3eed65b2..0000000000000000000000000000000000000000
--- a/tests/functional/lvm-auto-discovery/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-auto-discovery/ceph-override.json b/tests/functional/lvm-auto-discovery/ceph-override.json
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..fe2ff40d62861c37015eef831620b2e3a4a5a246
--- /dev/null
+++ b/tests/functional/lvm-auto-discovery/ceph-override.json
@@ -0,0 +1 @@
+../all_daemons/ceph-override.json
\ No newline at end of file

diff --git a/tests/functional/lvm-auto-discovery/container/ceph-override.json b/tests/functional/lvm-auto-discovery/container/ceph-override.json
deleted file mode 100644 (file)
index 1a9600a14d29286f5edf5c8f500a3b7f3eed65b2..0000000000000000000000000000000000000000
--- a/tests/functional/lvm-auto-discovery/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-auto-discovery/container/ceph-override.json b/tests/functional/lvm-auto-discovery/container/ceph-override.json
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..8417cc0c986053d407f94209d5c2bedb1f98b179
--- /dev/null
+++ b/tests/functional/lvm-auto-discovery/container/ceph-override.json
@@ -0,0 +1 @@
+../../all_daemons/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 (file)
index 1a9600a14d29286f5edf5c8f500a3b7f3eed65b2..0000000000000000000000000000000000000000
--- 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 (symlink)
index 0000000000000000000000000000000000000000..fe2ff40d62861c37015eef831620b2e3a4a5a246
--- /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 (file)
index 1a9600a14d29286f5edf5c8f500a3b7f3eed65b2..0000000000000000000000000000000000000000
--- 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 (symlink)
index 0000000000000000000000000000000000000000..8417cc0c986053d407f94209d5c2bedb1f98b179
--- /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 (file)
index 1a9600a14d29286f5edf5c8f500a3b7f3eed65b2..0000000000000000000000000000000000000000
--- 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 (symlink)
index 0000000000000000000000000000000000000000..fe2ff40d62861c37015eef831620b2e3a4a5a246
--- /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 (file)
index cce7e62e8729543daf39af5382978338c28f6d93..0000000000000000000000000000000000000000
--- 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 (symlink)
index 0000000000000000000000000000000000000000..8417cc0c986053d407f94209d5c2bedb1f98b179
--- /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 (file)
index 1a9600a14d29286f5edf5c8f500a3b7f3eed65b2..0000000000000000000000000000000000000000
--- 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 (symlink)
index 0000000000000000000000000000000000000000..fe2ff40d62861c37015eef831620b2e3a4a5a246
--- /dev/null
+++ b/tests/functional/shrink_osd/ceph-override.json
@@ -0,0 +1 @@
+../all_daemons/ceph-override.json
\ No newline at end of file