From 2754895b8956ac9446d610c0b8b108845cb48821 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Tue, 11 Aug 2020 15:26:16 +0200 Subject: [PATCH] tests: move erasure pool testing in lvm_osds This commit moves the erasure pool creation testing from `all_daemons` to `lvm_osds` so we can decrease the number of osd nodes we spawn so the OVH Jenkins slaves aren't less overwhelmed when a `all_daemons` based scenario is being tested. Signed-off-by: Guillaume Abrioux (cherry picked from commit 8476beb5b1f673d8b0925293d9273041c99a9bac) --- .../all_daemons/container/group_vars/all | 5 +--- .../all_daemons/container/group_vars/clients | 7 ++---- tests/functional/all_daemons/container/hosts | 2 -- .../container/vagrant_variables.yml | 2 +- tests/functional/all_daemons/group_vars/all | 5 +--- .../functional/all_daemons/group_vars/clients | 9 ++------ tests/functional/all_daemons/hosts | 2 -- .../all_daemons/vagrant_variables.yml | 2 +- .../lvm-osds/container/group_vars/all | 23 ++++++++++++++++++- tests/functional/lvm-osds/group_vars/all | 23 ++++++++++++++++++- 10 files changed, 52 insertions(+), 28 deletions(-) diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all index ee85a4327..265bd5ab0 100644 --- a/tests/functional/all_daemons/container/group_vars/all +++ b/tests/functional/all_daemons/container/group_vars/all @@ -20,10 +20,7 @@ openstack_glance_pool: name: "images" pg_num: "{{ osd_pool_default_pg_num }}" pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "HDD" - type: 3 - erasure_profile: "" - expected_num_objects: "" + type: 1 size: 1 pg_autoscale_mode: True target_size_ratio: 0.2 diff --git a/tests/functional/all_daemons/container/group_vars/clients b/tests/functional/all_daemons/container/group_vars/clients index a8ea366d0..f91445989 100644 --- a/tests/functional/all_daemons/container/group_vars/clients +++ b/tests/functional/all_daemons/container/group_vars/clients @@ -7,16 +7,13 @@ test: pgp_num: "{{ osd_pool_default_pg_num }}" rule_name: "HDD" type: 1 - erasure_profile: "" - expected_num_objects: "" + size: 1 test2: name: "test2" pg_num: "{{ osd_pool_default_pg_num }}" pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "HDD" type: 1 - erasure_profile: "" - expected_num_objects: "" + size: 1 pools: - "{{ test }}" - "{{ test2 }}" diff --git a/tests/functional/all_daemons/container/hosts b/tests/functional/all_daemons/container/hosts index 1fde8ef1b..fe64c8e8b 100644 --- a/tests/functional/all_daemons/container/hosts +++ b/tests/functional/all_daemons/container/hosts @@ -10,8 +10,6 @@ mgr0 osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }" osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }" osd2 osd_crush_location="{ 'root': 'default', 'host': 'osd2' }" -osd3 osd_crush_location="{ 'root': 'default', 'host': 'osd3' }" -osd4 osd_crush_location="{ 'root': 'default', 'host': 'osd4' }" [mdss] mds0 diff --git a/tests/functional/all_daemons/container/vagrant_variables.yml b/tests/functional/all_daemons/container/vagrant_variables.yml index 08ca70967..5e199588f 100644 --- a/tests/functional/all_daemons/container/vagrant_variables.yml +++ b/tests/functional/all_daemons/container/vagrant_variables.yml @@ -5,7 +5,7 @@ docker: True # DEFINE THE NUMBER OF VMS TO RUN mon_vms: 3 -osd_vms: 5 +osd_vms: 3 mds_vms: 3 rgw_vms: 1 nfs_vms: 1 diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all index bec682863..6b4eec29e 100644 --- a/tests/functional/all_daemons/group_vars/all +++ b/tests/functional/all_daemons/group_vars/all @@ -12,10 +12,7 @@ openstack_glance_pool: name: "images" pg_num: "{{ osd_pool_default_pg_num }}" pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "HDD" - type: 3 - erasure_profile: "" - expected_num_objects: "" + type: 1 size: 1 application: rbd pg_autoscale_mode: True diff --git a/tests/functional/all_daemons/group_vars/clients b/tests/functional/all_daemons/group_vars/clients index b892f8024..106fcbf43 100644 --- a/tests/functional/all_daemons/group_vars/clients +++ b/tests/functional/all_daemons/group_vars/clients @@ -7,18 +7,13 @@ test: pgp_num: "{{ osd_pool_default_pg_num }}" rule_name: "HDD" type: 1 - erasure_profile: "" - expected_num_objects: "" - size: "{{ osd_pool_default_size }}" + size: 1 test2: name: "test2" pg_num: "{{ osd_pool_default_pg_num }}" pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "HDD" type: 1 - erasure_profile: "" - expected_num_objects: "" - size: "{{ osd_pool_default_size }}" + size: 1 pools: - "{{ test }}" - "{{ test2 }}" diff --git a/tests/functional/all_daemons/hosts b/tests/functional/all_daemons/hosts index 841566eef..1c3bc54a0 100644 --- a/tests/functional/all_daemons/hosts +++ b/tests/functional/all_daemons/hosts @@ -10,8 +10,6 @@ mgr0 osd0 osd_crush_location="{ 'root': 'HDD', 'rack': 'mon-rackkkk', 'pod': 'monpod', 'host': 'osd0' }" osd1 osd_crush_location="{ 'root': 'default', 'host': 'osd1' }" osd2 osd_crush_location="{ 'root': 'default', 'host': 'osd2' }" -osd3 osd_crush_location="{ 'root': 'default', 'host': 'osd3' }" -osd4 osd_crush_location="{ 'root': 'default', 'host': 'osd4' }" [mdss] mds0 diff --git a/tests/functional/all_daemons/vagrant_variables.yml b/tests/functional/all_daemons/vagrant_variables.yml index 737e6c1c2..7da2da79d 100644 --- a/tests/functional/all_daemons/vagrant_variables.yml +++ b/tests/functional/all_daemons/vagrant_variables.yml @@ -5,7 +5,7 @@ docker: false # DEFINE THE NUMBER OF VMS TO RUN mon_vms: 3 -osd_vms: 5 +osd_vms: 3 mds_vms: 3 rgw_vms: 1 nfs_vms: 1 diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all index 5e05c0d57..1668c947e 100644 --- a/tests/functional/lvm-osds/container/group_vars/all +++ b/tests/functional/lvm-osds/container/group_vars/all @@ -20,4 +20,25 @@ ceph_conf_overrides: osd_pool_default_size: 1 dashboard_enabled: False handler_health_mon_check_delay: 10 -handler_health_osd_check_delay: 10 \ No newline at end of file +handler_health_osd_check_delay: 10 +openstack_config: True +openstack_glance_pool: + name: "images" + pg_num: "{{ osd_pool_default_pg_num }}" + pgp_num: "{{ osd_pool_default_pg_num }}" + type: 3 + size: 1 + erasure_profile: "" + application: rbd + pg_autoscale_mode: True + target_size_ratio: 0.2 +openstack_cinder_pool: + name: "volumes" + pg_num: "{{ osd_pool_default_pg_num }}" + pgp_num: "{{ osd_pool_default_pg_num }}" + type: 1 + size: 1 + application: rbd +openstack_pools: + - "{{ openstack_glance_pool }}" + - "{{ openstack_cinder_pool }}" \ No newline at end of file diff --git a/tests/functional/lvm-osds/group_vars/all b/tests/functional/lvm-osds/group_vars/all index c8b7d1895..8cae342f0 100644 --- a/tests/functional/lvm-osds/group_vars/all +++ b/tests/functional/lvm-osds/group_vars/all @@ -15,4 +15,25 @@ ceph_conf_overrides: osd_pool_default_size: 1 dashboard_enabled: False handler_health_mon_check_delay: 10 -handler_health_osd_check_delay: 10 \ No newline at end of file +handler_health_osd_check_delay: 10 +openstack_config: True +openstack_glance_pool: + name: "images" + pg_num: "{{ osd_pool_default_pg_num }}" + pgp_num: "{{ osd_pool_default_pg_num }}" + type: 3 + size: 1 + erasure_profile: "" + application: rbd + pg_autoscale_mode: True + target_size_ratio: 0.2 +openstack_cinder_pool: + name: "volumes" + pg_num: "{{ osd_pool_default_pg_num }}" + pgp_num: "{{ osd_pool_default_pg_num }}" + type: 1 + size: 1 + application: rbd +openstack_pools: + - "{{ openstack_glance_pool }}" + - "{{ openstack_cinder_pool }}" \ No newline at end of file -- 2.39.5