containers: bump memory limit

A default value of 4GB for MDS is more appropriate and 3GB for OSD also.

Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1531607
Signed-off-by: Sébastien Han <seb@redhat.com>
(cherry picked from commit 97f520bc7488b8e09d4057783049c8975fbc336e)
Signed-off-by: Sébastien Han <seb@redhat.com>

diff --git a/group_vars/mdss.yml.sample b/group_vars/mdss.yml.sample
index 3bfab976943294d58dfc84d3946e1e31c56de1c8..82ab1269b3dd3af43a060ce2680b302c03d08ddd 100644 (file)
--- a/group_vars/mdss.yml.sample
+++ b/group_vars/mdss.yml.sample
@@ -27,7 +27,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_mds_docker_extra_env' variable.
-#ceph_mds_docker_memory_limit: 1g
+#ceph_mds_docker_memory_limit: 4g
 #ceph_mds_docker_cpu_limit: 1
 
 # we currently for MDS_NAME to hostname because of a bug in ceph-docker

diff --git a/group_vars/osds.yml.sample b/group_vars/osds.yml.sample
index 0c563eb0bc9d56b29f84701d63d842f261373363..29385ef6980b5c1fb08efe648469babc06d13f07 100644 (file)
--- a/group_vars/osds.yml.sample
+++ b/group_vars/osds.yml.sample
@@ -230,7 +230,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: 1g
+#ceph_osd_docker_memory_limit: 3g
 #ceph_osd_docker_cpu_limit: 1
 
 # PREPARE DEVICE

diff --git a/roles/ceph-mds/defaults/main.yml b/roles/ceph-mds/defaults/main.yml
index b065bc7b62e0baf5ed9b05407b695f3f3a05385c..8c62a666aae7c59ba99b66d99f33d251ef1ef1c4 100644 (file)
--- a/roles/ceph-mds/defaults/main.yml
+++ b/roles/ceph-mds/defaults/main.yml
@@ -19,7 +19,7 @@ copy_admin_key: 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_mds_docker_extra_env' variable.
-ceph_mds_docker_memory_limit: 1g
+ceph_mds_docker_memory_limit: 4g
 ceph_mds_docker_cpu_limit: 1
 
 # we currently for MDS_NAME to hostname because of a bug in ceph-docker

diff --git a/roles/ceph-osd/defaults/main.yml b/roles/ceph-osd/defaults/main.yml
index 03169e061f92db759c91e224bc7c05b1e439e70c..ab0c95d65fd75d4a0de0ada2a4b0115398e51624 100644 (file)
--- a/roles/ceph-osd/defaults/main.yml
+++ b/roles/ceph-osd/defaults/main.yml
@@ -222,7 +222,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: 1g
+ceph_osd_docker_memory_limit: 3g
 ceph_osd_docker_cpu_limit: 1
 
 # PREPARE DEVICE