From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Wed, 29 Apr 2020 23:23:20 +0000 (+0200)
Subject: tests: update pools definitions
X-Git-Tag: v6.0.0alpha2~183
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=83faf943512f4c8010ab5d42fc2e38e169bcc4fe;p=ceph-ansible.git

tests: update pools definitions

setting attributes with empty string is a bad user input.
Also, removing `rule_name` attribute when creating a code erasure pool.
(this rule isnt intended for code erasure pool type).

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all
index 58756bd94..6b19bcbd8 100644
--- a/tests/functional/all_daemons/container/group_vars/all
+++ b/tests/functional/all_daemons/container/group_vars/all
@@ -22,10 +22,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: ""
   size: 1
   pg_autoscale_mode: True
   target_size_ratio: 0.2
@@ -35,8 +32,6 @@ openstack_cinder_pool:
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "HDD"
   type: 1
-  erasure_profile: ""
-  expected_num_objects: ""
   size: 1
 openstack_pools:
   - "{{ openstack_glance_pool }}"
diff --git a/tests/functional/all_daemons/container/group_vars/clients b/tests/functional/all_daemons/container/group_vars/clients
index a8ea366d0..27248d737 100644
--- a/tests/functional/all_daemons/container/group_vars/clients
+++ b/tests/functional/all_daemons/container/group_vars/clients
@@ -7,16 +7,12 @@ test:
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "HDD"
   type: 1
-  erasure_profile: ""
-  expected_num_objects: ""
 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: ""
 pools:
   - "{{ test }}"
   - "{{ test2 }}"
diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all
index 1469ff555..8117ebc21 100644
--- a/tests/functional/all_daemons/group_vars/all
+++ b/tests/functional/all_daemons/group_vars/all
@@ -14,10 +14,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: ""
   size: 1
   application: rbd
   pg_autoscale_mode: True
@@ -28,8 +25,6 @@ openstack_cinder_pool:
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "HDD"
   type: 1
-  erasure_profile: ""
-  expected_num_objects: ""
   size: 1
   application: rbd
 openstack_pools:
diff --git a/tests/functional/all_daemons/group_vars/clients b/tests/functional/all_daemons/group_vars/clients
index b892f8024..64ff43313 100644
--- a/tests/functional/all_daemons/group_vars/clients
+++ b/tests/functional/all_daemons/group_vars/clients
@@ -7,8 +7,6 @@ test:
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "HDD"
   type: 1
-  erasure_profile: ""
-  expected_num_objects: ""
   size: "{{ osd_pool_default_size }}"
 test2:
   name: "test2"
@@ -16,8 +14,6 @@ test2:
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "HDD"
   type: 1
-  erasure_profile: ""
-  expected_num_objects: ""
   size: "{{ osd_pool_default_size }}"
 pools:
   - "{{ test }}"