ceph
/
ceph-ansible
mirror of https://github.com/ceph/ceph-ansible.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refer to expected-num-ojects as expected_num_objects, not size 

Follow up patch to PR 2432 [1] which replaces "size" (sorry if
the original bug used that term, which can be confusing) with
expected_num_objects as is used in the Ceph documentation [2].

[1] https://github.com/ceph/ceph-ansible/pull/2432/files
[2] http://docs.ceph.com/docs/jewel/rados/operations/pools
pull/2472/head
John Fulton 2018-03-25 20:36:27 +00:00 committed by Sébastien Han
parent 691ddf5349
commit e6e6bd078a
11 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
group_vars/clients.yml.sample
View File

@ -21,7 +21,7 @@ dummy:
# rule_name: "replicated_rule"
# type: "replicated"
# erasure_profile: ""
# size: ""
# expected_num_objects: ""
#test2:
# name: "test2"
# pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@ -29,7 +29,7 @@ dummy:
# rule_name: "replicated_rule"
# type: "replicated"
# erasure_profile: ""
# size: ""
# expected_num_objects: ""
#pools:
# - "{{ test }}"
# - "{{ test2 }}"

10
group_vars/mons.yml.sample
View File

@ -93,7 +93,7 @@ dummy:
# rule_name: "replicated_rule"
# type: "replicated"
# erasure_profile: ""
# size: ""
# expected_num_objects: ""
#openstack_cinder_pool:
# name: "volumes"
# pg_num: "{{ osd_pool_default_pg_num }}"
@ -101,7 +101,7 @@ dummy:
# rule_name: "replicated_rule"
# type: "replicated"
# erasure_profile: ""
# size: ""
# expected_num_objects: ""
#openstack_nova_pool:
# name: "vms"
# pg_num: "{{ osd_pool_default_pg_num }}"
@ -109,7 +109,7 @@ dummy:
# rule_name: "replicated_rule"
# type: "replicated"
# erasure_profile: ""
# size: ""
# expected_num_objects: ""
#openstack_cinder_backup_pool:
# name: "backups"
# pg_num: "{{ osd_pool_default_pg_num }}"
@ -117,7 +117,7 @@ dummy:
# rule_name: "replicated_rule"
# type: "replicated"
# erasure_profile: ""
# size: ""
# expected_num_objects: ""
#openstack_gnocchi_pool:
# name: "metrics"
# pg_num: "{{ osd_pool_default_pg_num }}"
@ -125,7 +125,7 @@ dummy:
# rule_name: "replicated_rule"
# type: "replicated"
# erasure_profile: ""
# size: ""
# expected_num_objects: ""
#openstack_pools:
# - "{{ openstack_glance_pool }}"

4
roles/ceph-client/defaults/main.yml
View File

@ -13,7 +13,7 @@ test:
rule_name: "replicated_rule"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
test2:
name: "test2"
pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@ -21,7 +21,7 @@ test2:
rule_name: "replicated_rule"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
pools:
- "{{ test }}"
- "{{ test2 }}"

2
roles/ceph-client/tasks/create_users_keys.yml
View File

@ -56,7 +56,7 @@
{%- if item.type | default("replicated") == 'erasure' and item.erasure_profile != '' %}
{{ item.erasure_profile }}
{%- endif %}
{{ item.size | default('') }}
{{ item.expected_num_objects | default('') }}
with_items: "{{ pools }}"
changed_when: false
when:

10
roles/ceph-mon/defaults/main.yml
View File

@ -85,7 +85,7 @@ openstack_glance_pool:
rule_name: "replicated_rule"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
openstack_cinder_pool:
name: "volumes"
pg_num: "{{ osd_pool_default_pg_num }}"
@ -93,7 +93,7 @@ openstack_cinder_pool:
rule_name: "replicated_rule"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
openstack_nova_pool:
name: "vms"
pg_num: "{{ osd_pool_default_pg_num }}"
@ -101,7 +101,7 @@ openstack_nova_pool:
rule_name: "replicated_rule"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
openstack_cinder_backup_pool:
name: "backups"
pg_num: "{{ osd_pool_default_pg_num }}"
@ -109,7 +109,7 @@ openstack_cinder_backup_pool:
rule_name: "replicated_rule"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
openstack_gnocchi_pool:
name: "metrics"
pg_num: "{{ osd_pool_default_pg_num }}"
@ -117,7 +117,7 @@ openstack_gnocchi_pool:
rule_name: "replicated_rule"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
openstack_pools:
- "{{ openstack_glance_pool }}"

2
roles/ceph-mon/tasks/openstack_config.yml
View File

@ -10,7 +10,7 @@
{%- if item.type | default("replicated") == 'erasure' and item.erasure_profile != '' %}
{{ item.erasure_profile }}
{%- endif %}
{{ item.size | default('') }}
{{ item.expected_num_objects | default('') }}
with_items: "{{ openstack_pools | unique }}"
changed_when: false

4
tests/functional/centos/7/cluster/group_vars/clients
View File

@ -11,7 +11,7 @@ test:
rule_name: "HDD"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
test2:
name: "test2"
pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@ -19,7 +19,7 @@ test2:
rule_name: "HDD"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
pools:
- "{{ test }}"
- "{{ test2 }}"

4
tests/functional/centos/7/cluster/group_vars/mons
View File

@ -21,7 +21,7 @@ openstack_glance_pool:
rule_name: "HDD"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
openstack_cinder_pool:
name: "volumes"
pg_num: "{{ osd_pool_default_pg_num }}"
@ -29,7 +29,7 @@ openstack_cinder_pool:
rule_name: "HDD"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
openstack_pools:
- "{{ openstack_glance_pool }}"
- "{{ openstack_cinder_pool }}"

4
tests/functional/centos/7/docker-collocation/group_vars/clients
View File

@ -10,7 +10,7 @@ test:
rule_name: "HDD"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
test2:
name: "test2"
pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@ -18,7 +18,7 @@ test2:
rule_name: "HDD"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
pools:
- "{{ test }}"
- "{{ test2 }}"

4
tests/functional/centos/7/docker/group_vars/clients
View File

@ -10,7 +10,7 @@ test:
rule_name: "HDD"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
test2:
name: "test2"
pg_num: "{{ hostvars[groups[mon_group_name][0]]['osd_pool_default_pg_num'] }}"
@ -18,7 +18,7 @@ test2:
rule_name: "HDD"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
pools:
- "{{ test }}"
- "{{ test2 }}"

4
tests/functional/centos/7/docker/group_vars/mons
View File

@ -21,7 +21,7 @@ openstack_glance_pool:
rule_name: "HDD"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
openstack_cinder_pool:
name: "volumes"
pg_num: "{{ osd_pool_default_pg_num }}"
@ -29,7 +29,7 @@ openstack_cinder_pool:
rule_name: "HDD"
type: "replicated"
erasure_profile: ""
size: ""
expected_num_objects: ""
openstack_pools:
- "{{ openstack_glance_pool }}"
- "{{ openstack_cinder_pool }}"