From 80879df44df46c9d73d515fedbba2bb5c3412f33 Mon Sep 17 00:00:00 2001 From: Guillaume Abrioux Date: Wed, 30 Sep 2020 16:32:56 +0200 Subject: [PATCH] defaults: change defaults value this commit changes defaults value in default pool definitions. there's no need to define `pg_num`, `pgp_num`, `size` and `min_size`, `ceph_pool` module will use the current default if needed. This also drops the 3 following `set_fact` in `ceph-facts`: - osd_pool_default_pg_num, - osd_pool_default_pgp_num, - osd_pool_default_size_num Signed-off-by: Guillaume Abrioux (cherry picked from commit c101cb39319e872798026d3c8b698e10dddc5196) --- group_vars/all.yml.sample | 101 +----------------- group_vars/clients.yml.sample | 27 ----- group_vars/iscsigws.yml.sample | 2 +- group_vars/rhcs.yml.sample | 101 +----------------- roles/ceph-client/defaults/main.yml | 27 ----- roles/ceph-defaults/defaults/main.yml | 101 +----------------- roles/ceph-defaults/vars/main.yml | 3 - roles/ceph-facts/tasks/facts.yml | 12 --- roles/ceph-iscsi-gw/defaults/main.yml | 2 +- .../all_daemons/container/group_vars/all | 7 -- .../all_daemons/container/group_vars/clients | 6 -- tests/functional/all_daemons/group_vars/all | 7 -- .../functional/all_daemons/group_vars/clients | 6 -- .../collocation/container/group_vars/clients | 10 -- .../functional/collocation/group_vars/clients | 10 -- tests/functional/docker2podman/group_vars/all | 10 -- .../docker2podman/group_vars/clients | 10 -- .../container/inventory/group_vars/clients | 14 --- .../inventory/group_vars/clients | 13 --- .../lvm-osds/container/group_vars/all | 6 -- tests/functional/lvm-osds/group_vars/all | 6 -- tests/functional/ooo-collocation/hosts | 16 --- tests/functional/podman/group_vars/all | 10 -- tests/functional/podman/group_vars/clients | 10 -- 24 files changed, 11 insertions(+), 506 deletions(-) diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample index 978c0bdeca..5efb06b978 100644 --- a/group_vars/all.yml.sample +++ b/group_vars/all.yml.sample @@ -334,39 +334,12 @@ dummy: # eg: # cephfs_data_pool: # name: "{{ cephfs_data if cephfs_data is defined else 'cephfs_data' }}" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False # target_size_ratio: 0.2 #cephfs: cephfs # name of the ceph filesystem #cephfs_data_pool: # name: "{{ cephfs_data if cephfs_data is defined else 'cephfs_data' }}" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #cephfs_metadata_pool: # name: "{{ cephfs_metadata if cephfs_metadata is defined else 'cephfs_metadata' }}" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #cephfs_pools: # - "{{ cephfs_data_pool }}" # - "{{ cephfs_metadata_pool }}" @@ -620,101 +593,33 @@ dummy: # eg: # openstack_glance_pool: # name: "images" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" +# rule_name: "my_replicated_rule" # application: "rbd" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" # pg_autoscale_mode: False +# pg_num: 16 +# pgp_num: 16 # target_size_ratio: 0.2 #openstack_glance_pool: # name: "images" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" # application: "rbd" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #openstack_cinder_pool: # name: "volumes" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" # application: "rbd" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #openstack_nova_pool: # name: "vms" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" # application: "rbd" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #openstack_cinder_backup_pool: # name: "backups" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" # application: "rbd" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #openstack_gnocchi_pool: # name: "metrics" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" # application: "rbd" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #openstack_cephfs_data_pool: # name: "manila_data" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" # application: "cephfs" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #openstack_cephfs_metadata_pool: # name: "manila_metadata" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" # application: "cephfs" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #openstack_pools: # - "{{ openstack_glance_pool }}" # - "{{ openstack_cinder_pool }}" diff --git a/group_vars/clients.yml.sample b/group_vars/clients.yml.sample index f65f15f9f3..03aee9076f 100644 --- a/group_vars/clients.yml.sample +++ b/group_vars/clients.yml.sample @@ -23,41 +23,14 @@ dummy: # eg: # test: # name: "test" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" # application: "rbd" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False # target_size_ratio: 0.2 #test: # name: "test" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" # application: "rbd" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #test2: # name: "test2" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" # application: "rbd" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #pools: # - "{{ test }}" # - "{{ test2 }}" diff --git a/group_vars/iscsigws.yml.sample b/group_vars/iscsigws.yml.sample index 8fcfdfbb0a..bd0f7b8d56 100644 --- a/group_vars/iscsigws.yml.sample +++ b/group_vars/iscsigws.yml.sample @@ -17,7 +17,7 @@ dummy: #iscsi_conf_overrides: {} #iscsi_pool_name: rbd -#iscsi_pool_size: "{{ osd_pool_default_size }}" +#iscsi_pool_size: 3 #copy_admin_key: True diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample index 341501ad26..a0b66a43b2 100644 --- a/group_vars/rhcs.yml.sample +++ b/group_vars/rhcs.yml.sample @@ -334,39 +334,12 @@ ceph_iscsi_config_dev: false # eg: # cephfs_data_pool: # name: "{{ cephfs_data if cephfs_data is defined else 'cephfs_data' }}" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False # target_size_ratio: 0.2 #cephfs: cephfs # name of the ceph filesystem #cephfs_data_pool: # name: "{{ cephfs_data if cephfs_data is defined else 'cephfs_data' }}" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #cephfs_metadata_pool: # name: "{{ cephfs_metadata if cephfs_metadata is defined else 'cephfs_metadata' }}" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #cephfs_pools: # - "{{ cephfs_data_pool }}" # - "{{ cephfs_metadata_pool }}" @@ -620,101 +593,33 @@ ceph_docker_registry_auth: true # eg: # openstack_glance_pool: # name: "images" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" +# rule_name: "my_replicated_rule" # application: "rbd" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" # pg_autoscale_mode: False +# pg_num: 16 +# pgp_num: 16 # target_size_ratio: 0.2 #openstack_glance_pool: # name: "images" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" # application: "rbd" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #openstack_cinder_pool: # name: "volumes" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" # application: "rbd" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #openstack_nova_pool: # name: "vms" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" # application: "rbd" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #openstack_cinder_backup_pool: # name: "backups" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" # application: "rbd" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #openstack_gnocchi_pool: # name: "metrics" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" # application: "rbd" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #openstack_cephfs_data_pool: # name: "manila_data" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" # application: "cephfs" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #openstack_cephfs_metadata_pool: # name: "manila_metadata" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" # application: "cephfs" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False #openstack_pools: # - "{{ openstack_glance_pool }}" # - "{{ openstack_cinder_pool }}" diff --git a/roles/ceph-client/defaults/main.yml b/roles/ceph-client/defaults/main.yml index 6cb86448c6..1f70f1d385 100644 --- a/roles/ceph-client/defaults/main.yml +++ b/roles/ceph-client/defaults/main.yml @@ -15,41 +15,14 @@ user_config: false # eg: # test: # name: "test" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" # application: "rbd" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False # target_size_ratio: 0.2 test: name: "test" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "replicated_rule" application: "rbd" - type: 1 - erasure_profile: "" - expected_num_objects: "" - size: "{{ osd_pool_default_size }}" - min_size: "{{ osd_pool_default_min_size }}" - pg_autoscale_mode: False test2: name: "test2" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "replicated_rule" application: "rbd" - type: 1 - erasure_profile: "" - expected_num_objects: "" - size: "{{ osd_pool_default_size }}" - min_size: "{{ osd_pool_default_min_size }}" - pg_autoscale_mode: False pools: - "{{ test }}" - "{{ test2 }}" diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml index a224660531..39c6cf74cb 100644 --- a/roles/ceph-defaults/defaults/main.yml +++ b/roles/ceph-defaults/defaults/main.yml @@ -326,39 +326,12 @@ enable_ceph_volume_debug: False # eg: # cephfs_data_pool: # name: "{{ cephfs_data if cephfs_data is defined else 'cephfs_data' }}" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" -# pg_autoscale_mode: False # target_size_ratio: 0.2 cephfs: cephfs # name of the ceph filesystem cephfs_data_pool: name: "{{ cephfs_data if cephfs_data is defined else 'cephfs_data' }}" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "replicated_rule" - type: 1 - erasure_profile: "" - expected_num_objects: "" - size: "{{ osd_pool_default_size }}" - min_size: "{{ osd_pool_default_min_size }}" - pg_autoscale_mode: False cephfs_metadata_pool: name: "{{ cephfs_metadata if cephfs_metadata is defined else 'cephfs_metadata' }}" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "replicated_rule" - type: 1 - erasure_profile: "" - expected_num_objects: "" - size: "{{ osd_pool_default_size }}" - min_size: "{{ osd_pool_default_min_size }}" - pg_autoscale_mode: False cephfs_pools: - "{{ cephfs_data_pool }}" - "{{ cephfs_metadata_pool }}" @@ -612,101 +585,33 @@ openstack_config: false # eg: # openstack_glance_pool: # name: "images" -# pg_num: "{{ osd_pool_default_pg_num }}" -# pgp_num: "{{ osd_pool_default_pg_num }}" -# rule_name: "replicated_rule" -# type: 1 -# erasure_profile: "" -# expected_num_objects: "" +# rule_name: "my_replicated_rule" # application: "rbd" -# size: "{{ osd_pool_default_size }}" -# min_size: "{{ osd_pool_default_min_size }}" # pg_autoscale_mode: False +# pg_num: 16 +# pgp_num: 16 # target_size_ratio: 0.2 openstack_glance_pool: name: "images" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "replicated_rule" - type: 1 - erasure_profile: "" - expected_num_objects: "" application: "rbd" - size: "{{ osd_pool_default_size }}" - min_size: "{{ osd_pool_default_min_size }}" - pg_autoscale_mode: False openstack_cinder_pool: name: "volumes" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "replicated_rule" - type: 1 - erasure_profile: "" - expected_num_objects: "" application: "rbd" - size: "{{ osd_pool_default_size }}" - min_size: "{{ osd_pool_default_min_size }}" - pg_autoscale_mode: False openstack_nova_pool: name: "vms" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "replicated_rule" - type: 1 - erasure_profile: "" - expected_num_objects: "" application: "rbd" - size: "{{ osd_pool_default_size }}" - min_size: "{{ osd_pool_default_min_size }}" - pg_autoscale_mode: False openstack_cinder_backup_pool: name: "backups" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "replicated_rule" - type: 1 - erasure_profile: "" - expected_num_objects: "" application: "rbd" - size: "{{ osd_pool_default_size }}" - min_size: "{{ osd_pool_default_min_size }}" - pg_autoscale_mode: False openstack_gnocchi_pool: name: "metrics" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "replicated_rule" - type: 1 - erasure_profile: "" - expected_num_objects: "" application: "rbd" - size: "{{ osd_pool_default_size }}" - min_size: "{{ osd_pool_default_min_size }}" - pg_autoscale_mode: False openstack_cephfs_data_pool: name: "manila_data" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "replicated_rule" - type: 1 - erasure_profile: "" - expected_num_objects: "" application: "cephfs" - size: "{{ osd_pool_default_size }}" - min_size: "{{ osd_pool_default_min_size }}" - pg_autoscale_mode: False openstack_cephfs_metadata_pool: name: "manila_metadata" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "replicated_rule" - type: 1 - erasure_profile: "" - expected_num_objects: "" application: "cephfs" - size: "{{ osd_pool_default_size }}" - min_size: "{{ osd_pool_default_min_size }}" - pg_autoscale_mode: False openstack_pools: - "{{ openstack_glance_pool }}" - "{{ openstack_cinder_pool }}" diff --git a/roles/ceph-defaults/vars/main.yml b/roles/ceph-defaults/vars/main.yml index 57f973f767..c53d20846f 100644 --- a/roles/ceph-defaults/vars/main.yml +++ b/roles/ceph-defaults/vars/main.yml @@ -1,6 +1,3 @@ --- -ceph_osd_pool_default_size: 3 -ceph_osd_pool_default_min_size: 0 -ceph_osd_pool_default_pg_num: 8 ceph_osd_pool_default_crush_rule: -1 ceph_osd_pool_default_crush_rule_name: "replicated_rule" \ No newline at end of file diff --git a/roles/ceph-facts/tasks/facts.yml b/roles/ceph-facts/tasks/facts.yml index a67163f585..63b3c03fa3 100644 --- a/roles/ceph-facts/tasks/facts.yml +++ b/roles/ceph-facts/tasks/facts.yml @@ -303,18 +303,6 @@ - ceph_current_status['servicemap']['services'] is defined - ceph_current_status['servicemap']['services']['rgw'] is defined -- name: set_fact osd_pool_default_pg_num - set_fact: - osd_pool_default_pg_num: "{{ ceph_conf_overrides.get('global', {}).get('osd_pool_default_pg_num', ceph_osd_pool_default_pg_num) }}" - -- name: set_fact osd_pool_default_size - set_fact: - osd_pool_default_size: "{{ ceph_conf_overrides.get('global', {}).get('osd_pool_default_size', ceph_osd_pool_default_size) }}" - -- name: set_fact osd_pool_default_min_size - set_fact: - osd_pool_default_min_size: "{{ ceph_conf_overrides.get('global', {}).get('osd_pool_default_min_size', ceph_osd_pool_default_min_size) }}" - - name: check if the ceph conf exists stat: path: '/etc/ceph/{{ cluster }}.conf' diff --git a/roles/ceph-iscsi-gw/defaults/main.yml b/roles/ceph-iscsi-gw/defaults/main.yml index 50d8c9766e..2ae7efbdea 100644 --- a/roles/ceph-iscsi-gw/defaults/main.yml +++ b/roles/ceph-iscsi-gw/defaults/main.yml @@ -9,7 +9,7 @@ generate_crt: False iscsi_conf_overrides: {} iscsi_pool_name: rbd -iscsi_pool_size: "{{ osd_pool_default_size }}" +#iscsi_pool_size: 3 copy_admin_key: True diff --git a/tests/functional/all_daemons/container/group_vars/all b/tests/functional/all_daemons/container/group_vars/all index 6cbd6f306c..edbd5c57e7 100644 --- a/tests/functional/all_daemons/container/group_vars/all +++ b/tests/functional/all_daemons/container/group_vars/all @@ -20,18 +20,11 @@ ceph_conf_overrides: openstack_config: True openstack_glance_pool: name: "images" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - type: 1 size: 1 - 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 }}" rule_name: "HDD" - type: 1 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 f914459892..ec0bb3e099 100644 --- a/tests/functional/all_daemons/container/group_vars/clients +++ b/tests/functional/all_daemons/container/group_vars/clients @@ -3,16 +3,10 @@ user_config: True copy_admin_key: True test: name: "test" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" rule_name: "HDD" - type: 1 size: 1 test2: name: "test2" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - type: 1 size: 1 pools: - "{{ test }}" diff --git a/tests/functional/all_daemons/group_vars/all b/tests/functional/all_daemons/group_vars/all index f3123afbbf..6844e0add8 100644 --- a/tests/functional/all_daemons/group_vars/all +++ b/tests/functional/all_daemons/group_vars/all @@ -12,19 +12,12 @@ ceph_conf_overrides: openstack_config: True openstack_glance_pool: name: "images" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - type: 1 size: 1 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 }}" rule_name: "HDD" - type: 1 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 106fcbf434..4c37898ffd 100644 --- a/tests/functional/all_daemons/group_vars/clients +++ b/tests/functional/all_daemons/group_vars/clients @@ -3,16 +3,10 @@ copy_admin_key: True user_config: True test: name: "test" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" rule_name: "HDD" - type: 1 size: 1 test2: name: "test2" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - type: 1 size: 1 pools: - "{{ test }}" diff --git a/tests/functional/collocation/container/group_vars/clients b/tests/functional/collocation/container/group_vars/clients index 1131a16c54..393d3967b0 100644 --- a/tests/functional/collocation/container/group_vars/clients +++ b/tests/functional/collocation/container/group_vars/clients @@ -2,20 +2,10 @@ user_config: True test: name: "test" - pg_num: "{{ osd_pool_default_pg_num }}" - 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/collocation/group_vars/clients b/tests/functional/collocation/group_vars/clients index 1131a16c54..393d3967b0 100644 --- a/tests/functional/collocation/group_vars/clients +++ b/tests/functional/collocation/group_vars/clients @@ -2,20 +2,10 @@ user_config: True test: name: "test" - pg_num: "{{ osd_pool_default_pg_num }}" - 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/docker2podman/group_vars/all b/tests/functional/docker2podman/group_vars/all index 9ad6bf8508..c54051ee5e 100644 --- a/tests/functional/docker2podman/group_vars/all +++ b/tests/functional/docker2podman/group_vars/all @@ -21,21 +21,11 @@ ceph_conf_overrides: openstack_config: False openstack_glance_pool: name: "images" - 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 openstack_cinder_pool: name: "volumes" - 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 openstack_pools: - "{{ openstack_glance_pool }}" diff --git a/tests/functional/docker2podman/group_vars/clients b/tests/functional/docker2podman/group_vars/clients index a8ea366d04..d1d7677bfe 100644 --- a/tests/functional/docker2podman/group_vars/clients +++ b/tests/functional/docker2podman/group_vars/clients @@ -3,20 +3,10 @@ user_config: True copy_admin_key: True test: name: "test" - pg_num: "{{ osd_pool_default_pg_num }}" - 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/external_clients/container/inventory/group_vars/clients b/tests/functional/external_clients/container/inventory/group_vars/clients index 87cd220af7..fff928dee5 100644 --- a/tests/functional/external_clients/container/inventory/group_vars/clients +++ b/tests/functional/external_clients/container/inventory/group_vars/clients @@ -3,22 +3,8 @@ copy_admin_key: True user_config: True test: name: "test" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "replicated_rule" - type: 1 - erasure_profile: "" - expected_num_objects: "" - size: "{{ osd_pool_default_size }}" test2: name: "test2" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "replicated_rule" - type: 1 - erasure_profile: "" - expected_num_objects: "" - size: "{{ osd_pool_default_size }}" pools: - "{{ test }}" - "{{ test2 }}" \ No newline at end of file diff --git a/tests/functional/external_clients/inventory/group_vars/clients b/tests/functional/external_clients/inventory/group_vars/clients index 7d83b9fb56..fff928dee5 100644 --- a/tests/functional/external_clients/inventory/group_vars/clients +++ b/tests/functional/external_clients/inventory/group_vars/clients @@ -3,21 +3,8 @@ copy_admin_key: True user_config: True test: name: "test" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "replicated_rule" - type: 1 - erasure_profile: "" - expected_num_objects: "" - size: "{{ osd_pool_default_size }}" test2: name: "test2" - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - type: 1 - erasure_profile: "" - expected_num_objects: "" - size: "{{ osd_pool_default_size }}" pools: - "{{ test }}" - "{{ test2 }}" \ No newline at end of file diff --git a/tests/functional/lvm-osds/container/group_vars/all b/tests/functional/lvm-osds/container/group_vars/all index 80e6d7bd4e..2970d9f51d 100644 --- a/tests/functional/lvm-osds/container/group_vars/all +++ b/tests/functional/lvm-osds/container/group_vars/all @@ -26,18 +26,12 @@ 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 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: diff --git a/tests/functional/lvm-osds/group_vars/all b/tests/functional/lvm-osds/group_vars/all index 3b649fbeff..0f0883bcf4 100644 --- a/tests/functional/lvm-osds/group_vars/all +++ b/tests/functional/lvm-osds/group_vars/all @@ -21,18 +21,12 @@ 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 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: diff --git a/tests/functional/ooo-collocation/hosts b/tests/functional/ooo-collocation/hosts index 222905bfdc..4067f63877 100644 --- a/tests/functional/ooo-collocation/hosts +++ b/tests/functional/ooo-collocation/hosts @@ -15,26 +15,10 @@ all: ceph_docker_registry: quay.ceph.io cephfs_data_pool: name: 'manila_data' - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "replicated_rule" - type: 1 - erasure_profile: "" - expected_num_objects: "" application: "cephfs" - size: "{{ osd_pool_default_size }}" - min_size: "{{ osd_pool_default_min_size }}" cephfs_metadata_pool: name: 'manila_metadata' - pg_num: "{{ osd_pool_default_pg_num }}" - pgp_num: "{{ osd_pool_default_pg_num }}" - rule_name: "replicated_rule" - type: 1 - erasure_profile: "" - expected_num_objects: "" application: "cephfs" - size: "{{ osd_pool_default_size }}" - min_size: "{{ osd_pool_default_min_size }}" cephfs_pools: - "{{ cephfs_data_pool }}" - "{{ cephfs_metadata_pool }}" diff --git a/tests/functional/podman/group_vars/all b/tests/functional/podman/group_vars/all index ef3a3db61d..e6a41ce9b4 100644 --- a/tests/functional/podman/group_vars/all +++ b/tests/functional/podman/group_vars/all @@ -20,21 +20,11 @@ ceph_conf_overrides: openstack_config: True openstack_glance_pool: name: "images" - 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 openstack_cinder_pool: name: "volumes" - 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 openstack_pools: - "{{ openstack_glance_pool }}" diff --git a/tests/functional/podman/group_vars/clients b/tests/functional/podman/group_vars/clients index a8ea366d04..d1d7677bfe 100644 --- a/tests/functional/podman/group_vars/clients +++ b/tests/functional/podman/group_vars/clients @@ -3,20 +3,10 @@ user_config: True copy_admin_key: True test: name: "test" - pg_num: "{{ osd_pool_default_pg_num }}" - 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 }}"