From fe4b0aaa33a6e64bd00db9b4ecdf862a6e20a06b Mon Sep 17 00:00:00 2001 From: Yuri Weinstein Date: Tue, 17 Oct 2017 13:14:36 -0700 Subject: [PATCH] tests - ceph-ansible vars additions added symlinks for distros Fixes http://tracker.ceph.com/issues/21822 Signed-off-by: Yuri Weinstein (cherry picked from commit f30e9a5e6bd47129f8a35c1f9067216cfe8a6a70) Signed-off-by: Yuri Weinstein --- .../ceph-ansible/smoke/basic/1-distros/centos_7.3.yaml | 2 -- .../ceph-ansible/smoke/basic/1-distros/centos_latest.yaml | 1 + .../ceph-ansible/smoke/basic/1-distros/ubuntu_16.04.yaml | 2 -- .../ceph-ansible/smoke/basic/1-distros/ubuntu_latest.yaml | 1 + .../ceph-ansible/smoke/basic/2-ceph/ceph_ansible.yaml | 8 ++++++++ 5 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 qa/suites/ceph-ansible/smoke/basic/1-distros/centos_7.3.yaml create mode 120000 qa/suites/ceph-ansible/smoke/basic/1-distros/centos_latest.yaml delete mode 100644 qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_16.04.yaml create mode 120000 qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_latest.yaml diff --git a/qa/suites/ceph-ansible/smoke/basic/1-distros/centos_7.3.yaml b/qa/suites/ceph-ansible/smoke/basic/1-distros/centos_7.3.yaml deleted file mode 100644 index 9dfcc7f6bb114..0000000000000 --- a/qa/suites/ceph-ansible/smoke/basic/1-distros/centos_7.3.yaml +++ /dev/null @@ -1,2 +0,0 @@ -os_type: centos -os_version: "7.3" diff --git a/qa/suites/ceph-ansible/smoke/basic/1-distros/centos_latest.yaml b/qa/suites/ceph-ansible/smoke/basic/1-distros/centos_latest.yaml new file mode 120000 index 0000000000000..b5973b95278b7 --- /dev/null +++ b/qa/suites/ceph-ansible/smoke/basic/1-distros/centos_latest.yaml @@ -0,0 +1 @@ +../../../../../distros/supported/centos_latest.yaml \ No newline at end of file diff --git a/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_16.04.yaml b/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_16.04.yaml deleted file mode 100644 index a459fddffb28e..0000000000000 --- a/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_16.04.yaml +++ /dev/null @@ -1,2 +0,0 @@ -os_type: ubuntu -os_version: "16.04" diff --git a/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_latest.yaml b/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_latest.yaml new file mode 120000 index 0000000000000..cc5b15bccc72b --- /dev/null +++ b/qa/suites/ceph-ansible/smoke/basic/1-distros/ubuntu_latest.yaml @@ -0,0 +1 @@ +../../../../../distros/supported/ubuntu_latest.yaml \ No newline at end of file diff --git a/qa/suites/ceph-ansible/smoke/basic/2-ceph/ceph_ansible.yaml b/qa/suites/ceph-ansible/smoke/basic/2-ceph/ceph_ansible.yaml index 1b32b4aebde6b..bb9c57ee2385a 100644 --- a/qa/suites/ceph-ansible/smoke/basic/2-ceph/ceph_ansible.yaml +++ b/qa/suites/ceph-ansible/smoke/basic/2-ceph/ceph_ansible.yaml @@ -8,6 +8,9 @@ overrides: global: osd default pool size: 2 mon pg warn min per osd: 2 + osd pool default pg num: 64 + osd pool default pgp num: 64 + mon_max_pg_per_osd: 1024 ceph_test: true ceph_stable_release: luminous osd_scenario: collocated @@ -15,6 +18,11 @@ overrides: osd_auto_discovery: false ceph_origin: repository ceph_repository: dev + cephfs_pools: + - name: "cephfs_data" + pgs: "64" + - name: "cephfs_metadata" + pgs: "64" tasks: - ssh-keys: - ceph_ansible: -- 2.39.5