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>
(cherry picked from commit 6d1fe329980b91944cae58e68b909d34892667e7)

diff --git a/group_vars/all.yml.sample b/group_vars/all.yml.sample
index f73d12b226c52ccbcbaa92d94ea1c93fae284c1e..caa5a842c34b2a752ee9e047ddd1268a2d9a19ac 100644 (file)
--- a/group_vars/all.yml.sample
+++ b/group_vars/all.yml.sample
@@ -585,7 +585,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 }}"
@@ -595,7 +595,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 }}"
@@ -605,7 +605,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 }}"
@@ -615,7 +615,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 }}"
@@ -625,7 +625,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 }}"
@@ -635,7 +635,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 }}"
@@ -645,7 +645,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 89c0c604ae59ab4982a0bbc841034b69714f8da6..a2c6c17552812bd462b6171131a622381da0a6c8 100644 (file)
--- a/group_vars/rhcs.yml.sample
+++ b/group_vars/rhcs.yml.sample
@@ -585,7 +585,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 }}"
@@ -595,7 +595,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 }}"
@@ -605,7 +605,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 }}"
@@ -615,7 +615,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 }}"
@@ -625,7 +625,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 }}"
@@ -635,7 +635,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 }}"
@@ -645,7 +645,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 87ebce2ace6b8c94382c3bddebbf79348830bcb0..c39bf33c67085252e53458e72dcb6599d5bfe073 100644 (file)
--- a/roles/ceph-defaults/defaults/main.yml
+++ b/roles/ceph-defaults/defaults/main.yml
@@ -577,7 +577,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 }}"
@@ -587,7 +587,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 }}"
@@ -597,7 +597,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 }}"
@@ -607,7 +607,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 }}"
@@ -617,7 +617,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 }}"
@@ -627,7 +627,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 }}"
@@ -637,7 +637,7 @@ openstack_cephfs_metadata_pool:
   erasure_profile: ""
   expected_num_objects: ""
   application: "rbd"
-  size: ""
+  size: "{{ osd_pool_default_size }}"
 
 openstack_pools:
   - "{{ openstack_glance_pool }}"