ceph-volume tests/functional update filestore xenial test vars

Signed-off-by: Alfredo Deza <adeza@redhat.com>
(cherry picked from commit a096a016ccd0acc86ce816aba8ce95f6e3b68c11)

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 2f5d6fb2b247d35c3ff57279369538de8c44aa6a..e1c5706c08888ddf8577d1062877f09c0880a35a 100644 (file)
--- 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 (symlink)
index 0000000..30874df
--- /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 8ed725f8a84e236f1617fdc110ff84e8b1a01a09..aa867bcde1ab729f91f84c87110bef359e4cca66 120000 (symlink)
--- 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 d4b26c38346b02ee6c92daae570c1e57fe170dbc..0c6198948d45f9c29dc979b1dc2926b6068a6cb9 100644 (file)
--- 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 (symlink)
index 0000000..30874df
--- /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 1a8c37c13585842d07d726bb4771ea40c253030f..aa867bcde1ab729f91f84c87110bef359e4cca66 120000 (symlink)
--- 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