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>
(cherry picked from commit a9ed3579ae)
Signed-off-by: Sébastien Han <seb@redhat.com>
pull/2780/head
Sébastien Han 2018-06-15 15:39:34 -04:00 committed by Guillaume Abrioux
parent 2670a1f4ac
commit 60c06a7afe
4 changed files with 4 additions and 4 deletions

View File

@ -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.

View File

@ -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.

View File

@ -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.

View File

@ -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.