From e123d7f2eefcf4a079f03332daeb95ba50049b91 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Thu, 6 Sep 2018 11:23:30 -0400 Subject: [PATCH] ceph-volume tests/functional update filestore xenial test vars Signed-off-by: Alfredo Deza (cherry picked from commit a096a016ccd0acc86ce816aba8ce95f6e3b68c11) --- .../xenial/filestore/single-type-dmcrypt/group_vars/all | 7 +++++++ .../batch/xenial/filestore/single-type-dmcrypt/setup.yml | 1 + .../batch/xenial/filestore/single-type-dmcrypt/test.yml | 2 +- .../batch/xenial/filestore/single-type/group_vars/all | 7 +++++++ .../batch/xenial/filestore/single-type/setup.yml | 1 + .../functional/batch/xenial/filestore/single-type/test.yml | 2 +- 6 files changed, 18 insertions(+), 2 deletions(-) create mode 120000 src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type-dmcrypt/setup.yml create mode 120000 src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type/setup.yml diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type-dmcrypt/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type-dmcrypt/group_vars/all index 2f5d6fb2b247d..e1c5706c08888 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type-dmcrypt/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type-dmcrypt/group_vars/all @@ -23,3 +23,10 @@ ceph_conf_overrides: osd_pool_default_size: 1 osd: osd_journal_size: 2048 + +# The following is only needed for testing purposes and is not part of +# ceph-ansible supported variables + +osd_ids: + - 0 + - 1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type-dmcrypt/setup.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type-dmcrypt/setup.yml new file mode 120000 index 0000000000000..30874dfbb95b3 --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type-dmcrypt/setup.yml @@ -0,0 +1 @@ +../../../playbooks/noop.yml \ No newline at end of file diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type-dmcrypt/test.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type-dmcrypt/test.yml index 8ed725f8a84e2..aa867bcde1ab7 120000 --- a/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type-dmcrypt/test.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type-dmcrypt/test.yml @@ -1 +1 @@ -../../../playbooks/test_filestore_dmcrypt.yml \ No newline at end of file +../../../playbooks/test.yml \ No newline at end of file diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type/group_vars/all index d4b26c38346b0..0c6198948d45f 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type/group_vars/all @@ -20,3 +20,10 @@ ceph_conf_overrides: global: osd_pool_default_pg_num: 8 osd_pool_default_size: 1 + +# The following is only needed for testing purposes and is not part of +# ceph-ansible supported variables + +osd_ids: + - 0 + - 1 diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type/setup.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type/setup.yml new file mode 120000 index 0000000000000..30874dfbb95b3 --- /dev/null +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type/setup.yml @@ -0,0 +1 @@ +../../../playbooks/noop.yml \ No newline at end of file diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type/test.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type/test.yml index 1a8c37c135858..aa867bcde1ab7 120000 --- a/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type/test.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/filestore/single-type/test.yml @@ -1 +1 @@ -../../../playbooks/test_filestore.yml \ No newline at end of file +../../../playbooks/test.yml \ No newline at end of file -- 2.39.5