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 <gabrioux@redhat.com>
(cherry picked from commit c101cb39319e872798026d3c8b698e10dddc5196)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 978c0bdeca1a01191ca521da5750995edfe9759b..5efb06b978edeaa119e80f506ca069a2e4e0fd94 100644 (file)
--- 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 f65f15f9f3d015553809ab51f2f445f71fdc3b0a..03aee9076f4fc3b0bb8d16ca949a01af3484f50b 100644 (file)
--- 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 8fcfdfbb0a7f4a1cdd0fb0cdefc058d1911364fe..bd0f7b8d5691ac1e32b967cd9a969a78642332bd 100644 (file)
--- 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 341501ad26df0e421e417d58c72464d3080a27be..a0b66a43b288b490b697ae084e21e519b0aaa6c1 100644 (file)
--- 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 6cb86448c669012282f6f9f5cba623933a15e23c..1f70f1d385be653b5d3479e3312053d1b97a5f88 100644 (file)
--- 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 a224660531f3a8d2276a9321cf9c4272718e8e9c..39c6cf74cbd4f67be3d7e8e7e8af15af0c98bb9a 100644 (file)
--- 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 57f973f7670837416c56970ba4adf32b44b095ea..c53d20846f50502a08ee9d97e9ae6d9e3b5a5c71 100644 (file)
--- 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 a67163f5856f57583d3cffc1f0276eee9fc8a475..63b3c03fa3eb4c4463f2311317297f4ee640b264 100644 (file)
--- 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 50d8c9766e58f2dabfa35dddd44f3192b7a7a743..2ae7efbdeabf19822cab227a93d4e578426475c0 100644 (file)
--- 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 6cbd6f306cdedf628b8a6741d36ac1a3dd363e2d..edbd5c57e7d6ccf15b1b1d9d04f5e9b8e622b7b7 100644 (file)
--- 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 f914459892f3e35bd6e9deafd6945b84fa8a88fb..ec0bb3e099a123c576b536275818e6c655b0078f 100644 (file)
--- 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 f3123afbbfc97176eb4ec0e87960f8944071fc87..6844e0add834ebf4813ee346bf38a8f6ace4a814 100644 (file)
--- 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 106fcbf434223fe32a4343f66b9b93343c4a22e9..4c37898ffdae23d2820a4b5795856472a00e1fb6 100644 (file)
--- 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 1131a16c542bc1bf3700a2efa06ce2533ad6d548..393d3967b02677d0285477271f364827f7abd45b 100644 (file)
--- 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 1131a16c542bc1bf3700a2efa06ce2533ad6d548..393d3967b02677d0285477271f364827f7abd45b 100644 (file)
--- 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 9ad6bf850861cfde1902a141011ed5d5674393b8..c54051ee5ea019373520efb3c898845f19f88492 100644 (file)
--- 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 a8ea366d04a907a8c0c3109907f28c7b9d438f8d..d1d7677bfe44eb4ef35cefe642b97a7d86a85199 100644 (file)
--- 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 87cd220af70123557eaa2870b220789b8d32076e..fff928dee5a1940f5175fc188b1e758e28b7713d 100644 (file)
--- 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 7d83b9fb5630a5e224d452d9e716cc4ced508fc3..fff928dee5a1940f5175fc188b1e758e28b7713d 100644 (file)
--- 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 80e6d7bd4e65ee262abf0842871501839789a47e..2970d9f51da2d1fc8a4da4d09814cdecfd656c2d 100644 (file)
--- 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 3b649fbeff3d35b3b8bf99473c6bab224dfff6f1..0f0883bcf4e7ad42fdc439098b97ef9cadc2449a 100644 (file)
--- 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 222905bfdc98cfc54979c0931a9a8e96e265d11e..4067f638772f09614cc64f312d205d60d6860cbb 100644 (file)
--- 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 ef3a3db61df62a870fa32f1d5b04611f4d94509c..e6a41ce9b431ab097324bb126c854d8d0a457d03 100644 (file)
--- 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 a8ea366d04a907a8c0c3109907f28c7b9d438f8d..d1d7677bfe44eb4ef35cefe642b97a7d86a85199 100644 (file)
--- 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 }}"