From b09316f6ded737a217645b665ba413ae51e67000 Mon Sep 17 00:00:00 2001 From: Vasu Kulkarni Date: Fri, 6 Oct 2017 14:07:23 -0700 Subject: [PATCH] Fix ceph_ansible config for system and ganesha tests Signed-off-by: Vasu Kulkarni --- qa/suites/rgw/nfs-ganesha/clusters/4-node.yaml | 13 ++++++++----- qa/suites/rgw/system/clusters/4-node.yaml | 13 ++++++++----- qa/suites/smoke/ceph-ansible/vars/downstream.yaml | 2 +- 3 files changed, 17 insertions(+), 11 deletions(-) diff --git a/qa/suites/rgw/nfs-ganesha/clusters/4-node.yaml b/qa/suites/rgw/nfs-ganesha/clusters/4-node.yaml index 91b641905c258..e00e981ec58a0 100644 --- a/qa/suites/rgw/nfs-ganesha/clusters/4-node.yaml +++ b/qa/suites/rgw/nfs-ganesha/clusters/4-node.yaml @@ -1,13 +1,15 @@ overrides: ceph_ansible: vars: - osd_auto_discovery: false - ceph_test: True + ceph_stable: true ceph_origin: distro - journal_collocation: True + ceph_stable_rh_storage: true + ceph_repository: rhcs + ceph_stable_release: luminous + osd_scenario: collocated journal_size: 1024 - ceph_stable: True - ceph_stable_rh_storage: True + osd_auto_discovery: false + ceph_test: true ceph_conf_overrides: global: osd_default_pool_size: 3 @@ -15,6 +17,7 @@ overrides: osd_pool_default_pgp_num: 128 osd crush chooseleaf type: 0 roles: +- - mgr.x - - mon.a - osd.0 - osd.1 diff --git a/qa/suites/rgw/system/clusters/4-node.yaml b/qa/suites/rgw/system/clusters/4-node.yaml index 558f031cfbe26..4f25580373aaf 100644 --- a/qa/suites/rgw/system/clusters/4-node.yaml +++ b/qa/suites/rgw/system/clusters/4-node.yaml @@ -1,13 +1,15 @@ overrides: ceph_ansible: vars: - osd_auto_discovery: false - ceph_test: True + ceph_stable: true ceph_origin: distro - journal_collocation: True + ceph_stable_rh_storage: true + ceph_repository: rhcs + ceph_stable_release: luminous + osd_scenario: collocated journal_size: 1024 - ceph_stable: True - ceph_stable_rh_storage: True + osd_auto_discovery: false + ceph_test: true ceph_conf_overrides: global: osd_default_pool_size: 3 @@ -15,6 +17,7 @@ overrides: osd_pool_default_pgp_num: 128 osd crush chooseleaf type: 0 roles: +- - mgr.x - - mon.a - osd.0 - osd.1 diff --git a/qa/suites/smoke/ceph-ansible/vars/downstream.yaml b/qa/suites/smoke/ceph-ansible/vars/downstream.yaml index c6fe3946e4afc..9c743d5b19000 100644 --- a/qa/suites/smoke/ceph-ansible/vars/downstream.yaml +++ b/qa/suites/smoke/ceph-ansible/vars/downstream.yaml @@ -6,7 +6,7 @@ overrides: ceph_stable_rh_storage: true ceph_repository: rhcs ceph_stable_release: luminous - journal_collocation: true + osd_scenario: collocated journal_size: 1024 osd_auto_discovery: false ceph_test: true -- 2.39.5