From: Alfredo Deza Date: Thu, 6 Sep 2018 15:18:05 +0000 (-0400) Subject: ceph-volume tests/functional update bluestore centos7 test vars X-Git-Tag: v14.0.1~381^2~4 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=2549d5737283b39ecf5b0af98c73ffeb18033c36;p=ceph.git ceph-volume tests/functional update bluestore centos7 test vars Signed-off-by: Alfredo Deza --- 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 5cb47c8d24d6..d8e34f76c17d 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 8cf11d4ef8eb..30874dfbb95b 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 ac5ac6b0d19e..aa867bcde1ab 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 87b031fd4da3..37514396610f 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 165d9da291e2..aa867bcde1ab 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