defaults: change default size for openstack pools

default pool size should match the real default that is defined in ceph
itself.

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

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index 5343f45b7c82d8faeaf8f46d2b01c2b12930d131..bd57d872dd5bd2d5773b1a075753a7fa7e822a88 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -578,7 +578,7 @@ dummy:
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #  application: "rbd"
-#  size: ""
+#  size: "{{ osd_pool_default_size }}"
 #openstack_cinder_pool:
 #  name: "volumes"
 #  pg_num: "{{ osd_pool_default_pg_num }}"
@@ -588,7 +588,7 @@ dummy:
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #  application: "rbd"
-#  size: ""
+#  size: "{{ osd_pool_default_size }}"
 #openstack_nova_pool:
 #  name: "vms"
 #  pg_num: "{{ osd_pool_default_pg_num }}"
@@ -598,7 +598,7 @@ dummy:
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #  application: "rbd"
-#  size: ""
+#  size: "{{ osd_pool_default_size }}"
 #openstack_cinder_backup_pool:
 #  name: "backups"
 #  pg_num: "{{ osd_pool_default_pg_num }}"
@@ -608,7 +608,7 @@ dummy:
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #  application: "rbd"
-#  size: ""
+#  size: "{{ osd_pool_default_size }}"
 #openstack_gnocchi_pool:
 #  name: "metrics"
 #  pg_num: "{{ osd_pool_default_pg_num }}"
@@ -618,7 +618,7 @@ dummy:
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #  application: "rbd"
-#  size: ""
+#  size: "{{ osd_pool_default_size }}"
 #openstack_cephfs_data_pool:
 #  name: "manila_data"
 #  pg_num: "{{ osd_pool_default_pg_num }}"
@@ -628,7 +628,7 @@ dummy:
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #  application: "rbd"
-#  size: ""
+#  size: "{{ osd_pool_default_size }}"
 #openstack_cephfs_metadata_pool:
 #  name: "manila_metadata"
 #  pg_num: "{{ osd_pool_default_pg_num }}"
@@ -638,7 +638,7 @@ dummy:
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #  application: "rbd"
-#  size: ""
+#  size: "{{ osd_pool_default_size }}"
 
 #openstack_pools:
 #  - "{{ openstack_glance_pool }}"

diff --git a/group_vars/rhcs.yml.sample b/group_vars/rhcs.yml.sample
index 32b9145e2239254a65da5781711080a2de6097a4..211803c0d368bc32e135bfdb04ea7bda9040bc80 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -578,7 +578,7 @@ ceph_docker_registry: "registry.access.redhat.com/rhceph/"
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #  application: "rbd"
-#  size: ""
+#  size: "{{ osd_pool_default_size }}"
 #openstack_cinder_pool:
 #  name: "volumes"
 #  pg_num: "{{ osd_pool_default_pg_num }}"
@@ -588,7 +588,7 @@ ceph_docker_registry: "registry.access.redhat.com/rhceph/"
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #  application: "rbd"
-#  size: ""
+#  size: "{{ osd_pool_default_size }}"
 #openstack_nova_pool:
 #  name: "vms"
 #  pg_num: "{{ osd_pool_default_pg_num }}"
@@ -598,7 +598,7 @@ ceph_docker_registry: "registry.access.redhat.com/rhceph/"
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #  application: "rbd"
-#  size: ""
+#  size: "{{ osd_pool_default_size }}"
 #openstack_cinder_backup_pool:
 #  name: "backups"
 #  pg_num: "{{ osd_pool_default_pg_num }}"
@@ -608,7 +608,7 @@ ceph_docker_registry: "registry.access.redhat.com/rhceph/"
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #  application: "rbd"
-#  size: ""
+#  size: "{{ osd_pool_default_size }}"
 #openstack_gnocchi_pool:
 #  name: "metrics"
 #  pg_num: "{{ osd_pool_default_pg_num }}"
@@ -618,7 +618,7 @@ ceph_docker_registry: "registry.access.redhat.com/rhceph/"
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #  application: "rbd"
-#  size: ""
+#  size: "{{ osd_pool_default_size }}"
 #openstack_cephfs_data_pool:
 #  name: "manila_data"
 #  pg_num: "{{ osd_pool_default_pg_num }}"
@@ -628,7 +628,7 @@ ceph_docker_registry: "registry.access.redhat.com/rhceph/"
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #  application: "rbd"
-#  size: ""
+#  size: "{{ osd_pool_default_size }}"
 #openstack_cephfs_metadata_pool:
 #  name: "manila_metadata"
 #  pg_num: "{{ osd_pool_default_pg_num }}"
@@ -638,7 +638,7 @@ ceph_docker_registry: "registry.access.redhat.com/rhceph/"
 #  erasure_profile: ""
 #  expected_num_objects: ""
 #  application: "rbd"
-#  size: ""
+#  size: "{{ osd_pool_default_size }}"
 
 #openstack_pools:
 #  - "{{ openstack_glance_pool }}"

diff --git a/roles/ceph-defaults/defaults/main.yml b/roles/ceph-defaults/defaults/main.yml
index cd80f586a3140585a26f311b9cdd951b2a00925d..83cf9698f7789de59441089408162bc79934104d 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -570,7 +570,7 @@ openstack_glance_pool:
   erasure_profile: ""
   expected_num_objects: ""
   application: "rbd"
-  size: ""
+  size: "{{ osd_pool_default_size }}"
 openstack_cinder_pool:
   name: "volumes"
   pg_num: "{{ osd_pool_default_pg_num }}"
@@ -580,7 +580,7 @@ openstack_cinder_pool:
   erasure_profile: ""
   expected_num_objects: ""
   application: "rbd"
-  size: ""
+  size: "{{ osd_pool_default_size }}"
 openstack_nova_pool:
   name: "vms"
   pg_num: "{{ osd_pool_default_pg_num }}"
@@ -590,7 +590,7 @@ openstack_nova_pool:
   erasure_profile: ""
   expected_num_objects: ""
   application: "rbd"
-  size: ""
+  size: "{{ osd_pool_default_size }}"
 openstack_cinder_backup_pool:
   name: "backups"
   pg_num: "{{ osd_pool_default_pg_num }}"
@@ -600,7 +600,7 @@ openstack_cinder_backup_pool:
   erasure_profile: ""
   expected_num_objects: ""
   application: "rbd"
-  size: ""
+  size: "{{ osd_pool_default_size }}"
 openstack_gnocchi_pool:
   name: "metrics"
   pg_num: "{{ osd_pool_default_pg_num }}"
@@ -610,7 +610,7 @@ openstack_gnocchi_pool:
   erasure_profile: ""
   expected_num_objects: ""
   application: "rbd"
-  size: ""
+  size: "{{ osd_pool_default_size }}"
 openstack_cephfs_data_pool:
   name: "manila_data"
   pg_num: "{{ osd_pool_default_pg_num }}"
@@ -620,7 +620,7 @@ openstack_cephfs_data_pool:
   erasure_profile: ""
   expected_num_objects: ""
   application: "rbd"
-  size: ""
+  size: "{{ osd_pool_default_size }}"
 openstack_cephfs_metadata_pool:
   name: "manila_metadata"
   pg_num: "{{ osd_pool_default_pg_num }}"
@@ -630,7 +630,7 @@ openstack_cephfs_metadata_pool:
   erasure_profile: ""
   expected_num_objects: ""
   application: "rbd"
-  size: ""
+  size: "{{ osd_pool_default_size }}"
 
 openstack_pools:
   - "{{ openstack_glance_pool }}"