From a68091c923cf0024ae28cf9f1a20ed4f5cac78fd Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 25 Apr 2018 17:33:35 +0200 Subject: [PATCH] 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 --- group_vars/clients.yml.sample | 4 ++-- group_vars/mons.yml.sample | 10 +++++----- roles/ceph-client/defaults/main.yml | 4 ++-- roles/ceph-client/tasks/create_users_keys.yml | 4 ++-- roles/ceph-mon/defaults/main.yml | 10 +++++----- roles/ceph-mon/tasks/openstack_config.yml | 4 ++-- tests/functional/centos/7/cluster/group_vars/clients | 4 ++-- tests/functional/centos/7/cluster/group_vars/mons | 4 ++-- .../centos/7/docker-collocation/group_vars/clients | 4 ++-- tests/functional/centos/7/docker/group_vars/clients | 4 ++-- tests/functional/centos/7/docker/group_vars/mons | 4 ++-- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/group_vars/clients.yml.sample b/group_vars/clients.yml.sample index a0e9e57b5..1f5b88611 100644 --- 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 61db7484c..6d11b9419 100644 --- 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 320e7a9fb..bf5bed58e 100644 --- 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 60e31138b..93f1e2006 100644 --- 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 becce1969..3897b8b92 100644 --- 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 cfabd996c..93ad82fce 100644 --- 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 901144d73..21e5c5691 100644 --- 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 7e07259af..0919b52cc 100644 --- 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 f45d793a9..0fcdc83f7 100644 --- 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 99bd19b34..cbd665ce3 100644 --- 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 7e07259af..0919b52cc 100644 --- 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: -- 2.39.5