ceph-volume tests/functional update bluestore xenial test vars

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

diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/bluestore/single-type-dmcrypt/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/bluestore/single-type-dmcrypt/group_vars/all
index 78228765eb9ec01171fc0fa48c41bc539bdecf08..72bbca58f0155e7b6eea87c565d1e319a484f0b5 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/bluestore/single-type-dmcrypt/group_vars/all
+++ b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/bluestore/single-type-dmcrypt/group_vars/all
@@ -21,3 +21,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/bluestore/single-type-dmcrypt/setup.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/bluestore/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/bluestore/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/bluestore/single-type-dmcrypt/test.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/bluestore/single-type-dmcrypt/test.yml
index ac5ac6b0d19e666f900042e16e22cdc81b74d7e5..aa867bcde1ab729f91f84c87110bef359e4cca66 120000 (symlink)
--- a/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/bluestore/single-type-dmcrypt/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/bluestore/single-type-dmcrypt/test.yml
@@ -1 +1 @@
-../../../playbooks/test_bluestore_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/bluestore/single-type/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/bluestore/single-type/group_vars/all
index 87b031fd4da32906a77b07682551984f22b2657f..37514396610fb23984c036c3fea7987b518d8eb9 100644 (file)
--- a/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/bluestore/single-type/group_vars/all
+++ b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/bluestore/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/bluestore/single-type/setup.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/bluestore/single-type/setup.yml
new file mode 120000 (symlink)
index 0000000..30874df
--- /dev/null
+++ b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/bluestore/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/bluestore/single-type/test.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/bluestore/single-type/test.yml
index 165d9da291e2f18841290796dd657e1a8fe8fe0a..aa867bcde1ab729f91f84c87110bef359e4cca66 120000 (symlink)
--- a/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/bluestore/single-type/test.yml
+++ b/src/ceph-volume/ceph_volume/tests/functional/batch/xenial/bluestore/single-type/test.yml
@@ -1 +1 @@
-../../../playbooks/test_bluestore.yml
\ No newline at end of file
+../../../playbooks/test.yml
\ No newline at end of file