mon/osd: bump container memory limit

As discussed with the cores, the current limits are too low and should
be bumped to higher value.
So now by default monitors get 3GB and OSDs get 5GB.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1591876
Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/group_vars/mons.yml.sample b/group_vars/mons.yml.sample
index d65547739bbcba5a0fdc23db84964c7ca1192df6..1fea4bf70afe556449a521354181f30e67d6959e 100644 (file)
--- a/group_vars/mons.yml.sample
+++ b/group_vars/mons.yml.sample
@@ -77,7 +77,7 @@ dummy:
 # For the whole list of limits you can apply see: docs.docker.com/engine/admin/resource_constraints
 # Default values are based from: https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/2/html/red_hat_ceph_storage_hardware_guide/minimum_recommendations
 # These options can be passed using the 'ceph_mon_docker_extra_env' variable.
-#ceph_mon_docker_memory_limit: 1g
+#ceph_mon_docker_memory_limit: 3g
 #ceph_mon_docker_cpu_limit: 1
 
 # Use this variable to add extra env configuration to run your mon container.

diff --git a/group_vars/osds.yml.sample b/group_vars/osds.yml.sample
index d3ea98c7dc9dc024008ce62b98e85d62153a7c13..a00918811d25298d9ef2bb4e932f136611cebc29 100644 (file)
--- a/group_vars/osds.yml.sample
+++ b/group_vars/osds.yml.sample
@@ -237,7 +237,7 @@ dummy:
 # For the whole list of limits you can apply see: docs.docker.com/engine/admin/resource_constraints
 # Default values are based from: https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/2/html/red_hat_ceph_storage_hardware_guide/minimum_recommendations
 # These options can be passed using the 'ceph_osd_docker_extra_env' variable.
-#ceph_osd_docker_memory_limit: 3g
+#ceph_osd_docker_memory_limit: 5g
 #ceph_osd_docker_cpu_limit: 1
 
 # The next two variables are undefined, and thus, unused by default.

diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml
index 09183253f5a72f97d07b43a7c0eb39755f327fc0..513f21d28ee7a7dd49a935219e0c11cdfd3fc3c3 100644 (file)
--- a/roles/ceph-mon/defaults/main.yml
+++ b/roles/ceph-mon/defaults/main.yml
@@ -69,7 +69,7 @@ create_crush_tree: false
 # For the whole list of limits you can apply see: docs.docker.com/engine/admin/resource_constraints
 # Default values are based from: https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/2/html/red_hat_ceph_storage_hardware_guide/minimum_recommendations
 # These options can be passed using the 'ceph_mon_docker_extra_env' variable.
-ceph_mon_docker_memory_limit: 1g
+ceph_mon_docker_memory_limit: 3g
 ceph_mon_docker_cpu_limit: 1
 
 # Use this variable to add extra env configuration to run your mon container.

diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index 1b63433e75109cab98273f02e6c57a066c7b3860..c33d5447f3046985a3f59ffecf0d2375397e8efe 100644 (file)
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -229,7 +229,7 @@ ceph_config_keys: [] # DON'T TOUCH ME
 # For the whole list of limits you can apply see: docs.docker.com/engine/admin/resource_constraints
 # Default values are based from: https://access.redhat.com/documentation/en-us/red_hat_ceph_storage/2/html/red_hat_ceph_storage_hardware_guide/minimum_recommendations
 # These options can be passed using the 'ceph_osd_docker_extra_env' variable.
-ceph_osd_docker_memory_limit: 3g
+ceph_osd_docker_memory_limit: 5g
 ceph_osd_docker_cpu_limit: 1
 
 # The next two variables are undefined, and thus, unused by default.