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 8476beb5b1)

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

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 }}"

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

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

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

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 }}"

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

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

tests/functional/lvm-osds/container/group_vars/all

@@ -21,3 +21,24 @@ ceph_conf_overrides:
 dashboard_enabled: False
 handler_health_mon_check_delay: 10
 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 }}"

tests/functional/lvm-osds/group_vars/all

@@ -16,3 +16,24 @@ ceph_conf_overrides:
 dashboard_enabled: False
 handler_health_mon_check_delay: 10
 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 }}"