Skip to content
This repository has been archived by the owner on Aug 29, 2018. It is now read-only.

Commit

Permalink
Merge pull request #6399 from thrasher-redhat/1196783
Browse files Browse the repository at this point in the history
Merged by openshift-bot
  • Loading branch information
OpenShift Bot authored Jul 20, 2016
2 parents f10c29b + 505b792 commit 9960c8c
Showing 1 changed file with 13 additions and 0 deletions.
13 changes: 13 additions & 0 deletions node/conf/resource_limits.conf
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,12 @@
# oo-pam-enable --with-all-containers
# oo-admin-ctl-tc restart
#
# NOTE: If you change the memory_limit_in_bytes variable, run this command
# to update existing gears. Replace 512 with the new value in megabytes.
# Note the change in units from bytes to megabytes - memory_limit_in_bytes
# expects the value in bytes, where OPENSHIFT_GEAR_MEMORY_MB expects the
# value in megabytes.
# for i in /var/lib/openshift/*/.env/OPENSHIFT_GEAR_MEMORY_MB; do echo 512 > "$i"; done
#
# Default Profile
#
Expand Down Expand Up @@ -39,6 +45,13 @@ quota_blocks=1048576
# be the defaults for a gear.
#
# memory (RAM)
#
# NOTE: If you change the memory_limit_in_bytes variable, run this command
# to update existing gears. Replace 512 with the new value in megabytes.
# Note the change in units from bytes to megabytes - memory_limit_in_bytes
# expects the value in bytes, where OPENSHIFT_GEAR_MEMORY_MB expects the
# value in megabytes.
# for i in /var/lib/openshift/*/.env/OPENSHIFT_GEAR_MEMORY_MB; do echo 512 > "$i"; done
memory_limit_in_bytes=536870912 # 512MB
memory_memsw_limit_in_bytes=641728512 # 512M + 100M (100M swap)
# memory_soft_limit_in_bytes=-1
Expand Down

0 comments on commit 9960c8c

Please sign in to comment.