tests: update the type for the rule used in pools

As of ceph 12.2.5 the type of the parameter `type` is not a name anymore but
an id, therefore an `int` is expected otherwise it will fail with the
following error

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

diff --git a/group_vars/clients.yml.sample b/group_vars/clients.yml.sample
index a0e9e57b5389296bbe3025581c2e1b0793710054..1f5b886110270d4178101892750bf0c96317c4e9 100644 (file)
--- a/group_vars/clients.yml.sample
+++ b/group_vars/clients.yml.sample
@@ -23,7 +23,7 @@ dummy:
 #  pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
 #  pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
 #  rule_name: "replicated_rule"
-#  type: "replicated"
+#  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #test2:
@@ -31,7 +31,7 @@ dummy:
 #  pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
 #  pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
 #  rule_name: "replicated_rule"
-#  type: "replicated"
+#  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #pools:

diff --git a/group_vars/mons.yml.sample b/group_vars/mons.yml.sample
index 61db7484c3f0ade2cb54efe7e825cbb76b435a95..6d11b94199645d7b30e1aceda4fe712a4d1c61d3 100644 (file)
--- a/group_vars/mons.yml.sample
+++ b/group_vars/mons.yml.sample
@@ -91,7 +91,7 @@ dummy:
 #  pg_num: "{{ osd_pool_default_pg_num }}"
 #  pgp_num: "{{ osd_pool_default_pg_num }}"
 #  rule_name: "replicated_rule"
-#  type: "replicated"
+#  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #openstack_cinder_pool:
@@ -99,7 +99,7 @@ dummy:
 #  pg_num: "{{ osd_pool_default_pg_num }}"
 #  pgp_num: "{{ osd_pool_default_pg_num }}"
 #  rule_name: "replicated_rule"
-#  type: "replicated"
+#  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #openstack_nova_pool:
@@ -107,7 +107,7 @@ dummy:
 #  pg_num: "{{ osd_pool_default_pg_num }}"
 #  pgp_num: "{{ osd_pool_default_pg_num }}"
 #  rule_name: "replicated_rule"
-#  type: "replicated"
+#  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #openstack_cinder_backup_pool:
@@ -115,7 +115,7 @@ dummy:
 #  pg_num: "{{ osd_pool_default_pg_num }}"
 #  pgp_num: "{{ osd_pool_default_pg_num }}"
 #  rule_name: "replicated_rule"
-#  type: "replicated"
+#  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #openstack_gnocchi_pool:
@@ -123,7 +123,7 @@ dummy:
 #  pg_num: "{{ osd_pool_default_pg_num }}"
 #  pgp_num: "{{ osd_pool_default_pg_num }}"
 #  rule_name: "replicated_rule"
-#  type: "replicated"
+#  type: 1
 #  erasure_profile: ""
 #  expected_num_objects: ""
 

diff --git a/roles/ceph-client/defaults/main.yml b/roles/ceph-client/defaults/main.yml
index 320e7a9fbfe0eca32e6b523877080bdd3868c73a..bf5bed58e5c26c84b5a0d9e8f773e3d5a268293b 100644 (file)
--- a/roles/ceph-client/defaults/main.yml
+++ b/roles/ceph-client/defaults/main.yml
@@ -15,7 +15,7 @@ test:
   pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
   pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
   rule_name: "replicated_rule"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 test2:
@@ -23,7 +23,7 @@ test2:
   pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
   pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
   rule_name: "replicated_rule"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 pools:

diff --git a/roles/ceph-client/tasks/create_users_keys.yml b/roles/ceph-client/tasks/create_users_keys.yml
index 60e31138bff01919cae863850f5ff42c18d60a94..93f1e20069fbe4e08aacb75ebd825a846406394f 100644 (file)
--- a/roles/ceph-client/tasks/create_users_keys.yml
+++ b/roles/ceph-client/tasks/create_users_keys.yml
@@ -69,8 +69,8 @@
     {{ item.get('pg_num', hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num']) }}
     {{ item.pgp_num | default(item.pg_num) }}
     {{ item.rule_name | default("replicated_rule") }}
-    {{ item.type | default("replicated") }}
-    {%- if item.type | default("replicated") == 'erasure' and item.erasure_profile != '' %}
+    {{ 1 if item.type|default(1) == 'replicated' else 3 if item.type|default(1) == 'erasure' else item.type|default(1) }}
+    {%- if (item.type | default("1") == '3' or item.type | default("1") == 'erasure') and item.erasure_profile != '' %}
     {{ item.erasure_profile }}
     {%- endif %}
     {{ item.expected_num_objects | default('') }}

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index becce19694660708e2d8298c0ffc767831d583b4..3897b8b92f6155e3cd1a2f5649f6ad5415345a06 100644 (file)
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -83,7 +83,7 @@ openstack_glance_pool:
   pg_num: "{{ osd_pool_default_pg_num }}"
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "replicated_rule"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 openstack_cinder_pool:
@@ -91,7 +91,7 @@ openstack_cinder_pool:
   pg_num: "{{ osd_pool_default_pg_num }}"
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "replicated_rule"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 openstack_nova_pool:
@@ -99,7 +99,7 @@ openstack_nova_pool:
   pg_num: "{{ osd_pool_default_pg_num }}"
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "replicated_rule"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 openstack_cinder_backup_pool:
@@ -107,7 +107,7 @@ openstack_cinder_backup_pool:
   pg_num: "{{ osd_pool_default_pg_num }}"
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "replicated_rule"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 openstack_gnocchi_pool:
@@ -115,7 +115,7 @@ openstack_gnocchi_pool:
   pg_num: "{{ osd_pool_default_pg_num }}"
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "replicated_rule"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 

diff --git a/roles/ceph-mon/tasks/openstack_config.yml b/roles/ceph-mon/tasks/openstack_config.yml
index cfabd996c42c69bb7e57dd154cdb207c0d9939a7..93ad82fce509ea79380870938b0859c7af931bad 100644 (file)
--- a/roles/ceph-mon/tasks/openstack_config.yml
+++ b/roles/ceph-mon/tasks/openstack_config.yml
@@ -6,8 +6,8 @@
     {{ item.pg_num }}
     {{ item.pgp_num | default(item.pg_num) }}
     {{ item.rule_name | default("replicated_rule") }}
-    {{ item.type | default("replicated") }}
-    {%- if item.type | default("replicated") == 'erasure' and item.erasure_profile != '' %}
+    {{ 1 if item.type|default(1) == 'replicated' else 3 if item.type|default(1) == 'erasure' else item.type|default(1) }}
+    {%- if (item.type | default("1") == '3' or item.type | default("1") == 'erasure') and item.erasure_profile != '' %}
     {{ item.erasure_profile }}
     {%- endif %}
     {{ item.expected_num_objects | default('') }}

diff --git a/tests/functional/centos/7/cluster/group_vars/clients b/tests/functional/centos/7/cluster/group_vars/clients
index 901144d73bdc0d394e838743e6b1ea534ab2af96..21e5c5691952c9fb191b9dd7582cc5a7a67bb651 100644 (file)
--- a/tests/functional/centos/7/cluster/group_vars/clients
+++ b/tests/functional/centos/7/cluster/group_vars/clients
@@ -6,7 +6,7 @@ test:
   pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
   pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
   rule_name: "HDD"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 test2:
@@ -14,7 +14,7 @@ test2:
   pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
   pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
   rule_name: "HDD"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 pools:

diff --git a/tests/functional/centos/7/cluster/group_vars/mons b/tests/functional/centos/7/cluster/group_vars/mons
index 7e07259af44a1601c40aad1ca768a008f35563b9..0919b52cc4fca89630d15ac02198776de854e19b 100644 (file)
--- a/tests/functional/centos/7/cluster/group_vars/mons
+++ b/tests/functional/centos/7/cluster/group_vars/mons
@@ -19,7 +19,7 @@ openstack_glance_pool:
   pg_num: "{{ osd_pool_default_pg_num }}"
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "HDD"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 openstack_cinder_pool:
@@ -27,7 +27,7 @@ openstack_cinder_pool:
   pg_num: "{{ osd_pool_default_pg_num }}"
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "HDD"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 openstack_pools:

diff --git a/tests/functional/centos/7/docker-collocation/group_vars/clients b/tests/functional/centos/7/docker-collocation/group_vars/clients
index f45d793a9c9edca02db04211f34b3c57dab321db..0fcdc83f709a291a45cf7bfee86884db64a31766 100644 (file)
--- a/tests/functional/centos/7/docker-collocation/group_vars/clients
+++ b/tests/functional/centos/7/docker-collocation/group_vars/clients
@@ -5,7 +5,7 @@ test:
   pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
   pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
   rule_name: "HDD"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 test2:
@@ -13,7 +13,7 @@ test2:
   pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
   pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
   rule_name: "HDD"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 pools:

diff --git a/tests/functional/centos/7/docker/group_vars/clients b/tests/functional/centos/7/docker/group_vars/clients
index 99bd19b34c811b552f291f168239a02097a9cef7..cbd665ce341a4e3675524168cd986fc989bfa324 100644 (file)
--- a/tests/functional/centos/7/docker/group_vars/clients
+++ b/tests/functional/centos/7/docker/group_vars/clients
@@ -6,7 +6,7 @@ test:
   pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
   pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
   rule_name: "HDD"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 test2:
@@ -14,7 +14,7 @@ test2:
   pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
   pgp_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
   rule_name: "HDD"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 pools:

diff --git a/tests/functional/centos/7/docker/group_vars/mons b/tests/functional/centos/7/docker/group_vars/mons
index 7e07259af44a1601c40aad1ca768a008f35563b9..0919b52cc4fca89630d15ac02198776de854e19b 100644 (file)
--- a/tests/functional/centos/7/docker/group_vars/mons
+++ b/tests/functional/centos/7/docker/group_vars/mons
@@ -19,7 +19,7 @@ openstack_glance_pool:
   pg_num: "{{ osd_pool_default_pg_num }}"
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "HDD"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 openstack_cinder_pool:
@@ -27,7 +27,7 @@ openstack_cinder_pool:
   pg_num: "{{ osd_pool_default_pg_num }}"
   pgp_num: "{{ osd_pool_default_pg_num }}"
   rule_name: "HDD"
-  type: "replicated"
+  type: 1
   erasure_profile: ""
   expected_num_objects: ""
 openstack_pools: