From 16bd1a63108c34338ca85f183ba060e140a6df7a Mon Sep 17 00:00:00 2001 From: =?utf8?q?S=C3=A9bastien=20Han?= Date: Fri, 15 Jun 2018 15:39:34 -0400 Subject: [PATCH] mon/osd: bump container memory limit MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 (cherry picked from commit a9ed3579ae680949b4f53aee94003ca50d1ae721) Signed-off-by: Sébastien Han --- group_vars/mons.yml.sample | 2 +- group_vars/osds.yml.sample | 2 +- roles/ceph-mon/defaults/main.yml | 2 +- roles/ceph-osd/defaults/main.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/group_vars/mons.yml.sample b/group_vars/mons.yml.sample index 9e8b2fc6c..0a6a05372 100644 --- a/group_vars/mons.yml.sample +++ b/group_vars/mons.yml.sample @@ -118,7 +118,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 d32b5eb8a..2f53582f4 100644 --- a/group_vars/osds.yml.sample +++ b/group_vars/osds.yml.sample @@ -235,7 +235,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 # PREPARE DEVICE diff --git a/roles/ceph-mon/defaults/main.yml b/roles/ceph-mon/defaults/main.yml index e1e2d313f..ca27cc2cf 100644 --- a/roles/ceph-mon/defaults/main.yml +++ b/roles/ceph-mon/defaults/main.yml @@ -110,7 +110,7 @@ openstack_keys: # 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 e3cbcd88d..a1f8b90d7 100644 --- a/roles/ceph-osd/defaults/main.yml +++ b/roles/ceph-osd/defaults/main.yml @@ -227,7 +227,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 # PREPARE DEVICE -- 2.39.5