ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
(cherry picked from commit a19054be18)
pull/3850/head
Dimitri Savineau 2019-04-09 12:18:43 -04:00 committed by Guillaume Abrioux
parent c9a3def3a6
commit a1e73e8ff1
8 changed files with 8 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tests/functional/all_daemons/container/ceph-override.json
View File

@ -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"
}

1
tests/functional/all_daemons/container/ceph-override.json 120000
View File

@ -0,0 +1 @@
../ceph-override.json

9
tests/functional/lvm-auto-discovery/ceph-override.json
View File

@ -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"
}

1
tests/functional/lvm-auto-discovery/ceph-override.json 120000
View File

@ -0,0 +1 @@
../all_daemons/ceph-override.json

9
tests/functional/lvm-auto-discovery/container/ceph-override.json
View File

@ -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"
}

1
tests/functional/lvm-auto-discovery/container/ceph-override.json 120000
View File

@ -0,0 +1 @@
../../all_daemons/ceph-override.json

9
tests/functional/lvm-batch/ceph-override.json
View File

@ -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"
}

1
tests/functional/lvm-batch/ceph-override.json 120000
View File

@ -0,0 +1 @@
../all_daemons/ceph-override.json

9
tests/functional/lvm-batch/container/ceph-override.json
View File

@ -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"
}

1
tests/functional/lvm-batch/container/ceph-override.json 120000
View File

@ -0,0 +1 @@
../../all_daemons/ceph-override.json

9
tests/functional/shrink_mon/ceph-override.json
View File

@ -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"
}

1
tests/functional/shrink_mon/ceph-override.json 120000
View File

@ -0,0 +1 @@
../all_daemons/ceph-override.json

21
tests/functional/shrink_mon/container/ceph-override.json
View File

@ -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"
}

1
tests/functional/shrink_mon/container/ceph-override.json 120000
View File

@ -0,0 +1 @@
../../all_daemons/ceph-override.json

9
tests/functional/shrink_osd/ceph-override.json
View File

@ -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"
}

1
tests/functional/shrink_osd/ceph-override.json 120000
View File

@ -0,0 +1 @@
../all_daemons/ceph-override.json