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 <gabrioux@redhat.com>
(cherry picked from commit 8476beb5b1f673d8b0925293d9273041c99a9bac)

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index ee85a4327e9f3ebc51e8ca5023c299f225a13a4c..265bd5ab052a7b3856db6c8917135f0d2208a340 100644 (file)
--- 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 a8ea366d04a907a8c0c3109907f28c7b9d438f8d..f914459892f3e35bd6e9deafd6945b84fa8a88fb 100644 (file)
--- 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 1fde8ef1b5d85270308f75370e77c0b3c76dadaa..fe64c8e8b35d82c27944298358a3a7fe236e5845 100644 (file)
--- 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 08ca709679f0a55fd96d9b60167ead44d4d6e82c..5e199588f02473ab0b7d38a078c684b6987969ed 100644 (file)
--- 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 bec682863c261ad71ae959d2e5ce9e5bbb79e166..6b4eec29e93441d2154d2c2efb42d12dcf3583ce 100644 (file)
--- 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 b892f802488b975d9526e4338afae0f3819db561..106fcbf434223fe32a4343f66b9b93343c4a22e9 100644 (file)
--- 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 841566eef297456d52e1b315886d7b40e626e04b..1c3bc54a0f889ef15977d5b9d8cbc0e5f8127166 100644 (file)
--- 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 737e6c1c23c5544713b9e70c0f0afb780345f79f..7da2da79d9bec9265c9eee76a97d18108d8be8d3 100644 (file)
--- 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 5e05c0d575a9e7e6ed3a03db64c2a30c94d4d608..1668c947e3ba00a1558be219a2e4aa319d03a027 100644 (file)
--- 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 c8b7d1895010b6e34495a583435c47bb23d14f93..8cae342f0b32d45af19cc41a3510f2f66938befc 100644 (file)
--- 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