From 85d312cb5e8d86bb7e0cd6976b98746d48a76eb0 Mon Sep 17 00:00:00 2001 From: Alfredo Deza Date: Thu, 6 Sep 2018 11:18:05 -0400 Subject: [PATCH] ceph-volume tests/functional update bluestore centos7 test vars Signed-off-by: Alfredo Deza (cherry picked from commit 2549d5737283b39ecf5b0af98c73ffeb18033c36) --- .../centos7/bluestore/single-type-dmcrypt/group_vars/all | 7 +++++++ .../batch/centos7/bluestore/single-type-dmcrypt/setup.yml | 2 +- .../batch/centos7/bluestore/single-type-dmcrypt/test.yml | 2 +- .../batch/centos7/bluestore/single-type/group_vars/all | 7 +++++++ .../batch/centos7/bluestore/single-type/test.yml | 2 +- 5 files changed, 17 insertions(+), 3 deletions(-) diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/bluestore/single-type-dmcrypt/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/bluestore/single-type-dmcrypt/group_vars/all index 5cb47c8d24d65..d8e34f76c17d9 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/bluestore/single-type-dmcrypt/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/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/centos7/bluestore/single-type-dmcrypt/setup.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/bluestore/single-type-dmcrypt/setup.yml index 8cf11d4ef8eb1..30874dfbb95b3 120000 --- a/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/bluestore/single-type-dmcrypt/setup.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/bluestore/single-type-dmcrypt/setup.yml @@ -1 +1 @@ -../../../playbooks/setup_mixed_type.yml \ No newline at end of file +../../../playbooks/noop.yml \ No newline at end of file diff --git a/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/bluestore/single-type-dmcrypt/test.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/bluestore/single-type-dmcrypt/test.yml index ac5ac6b0d19e6..aa867bcde1ab7 120000 --- a/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/bluestore/single-type-dmcrypt/test.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/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/centos7/bluestore/single-type/group_vars/all b/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/bluestore/single-type/group_vars/all index 87b031fd4da32..37514396610fb 100644 --- a/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/bluestore/single-type/group_vars/all +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/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/centos7/bluestore/single-type/test.yml b/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/bluestore/single-type/test.yml index 165d9da291e2f..aa867bcde1ab7 120000 --- a/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/bluestore/single-type/test.yml +++ b/src/ceph-volume/ceph_volume/tests/functional/batch/centos7/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 -- 2.39.5