Try different way of passing memory limit
This reverts commit 830c854cf7
.
This commit is contained in:
parent
830c854cf7
commit
7840c992cc
|
@ -16,7 +16,7 @@ fas_client_groups: sysadmin-noc,sysadmin-badges,sysadmin-veteran
|
|||
fedmsg_error_recipients:
|
||||
- sysadmin-badges-members@fedoraproject.org
|
||||
|
||||
fedmsg_hub_memory_limit_mb: {{ (mem_size / 2) | int }}
|
||||
fedmsg_hub_memory_limit_mb: "{{ (mem_size / 2) | int }}"
|
||||
|
||||
# These are consumed by a task in roles/fedmsg/base/main.yml
|
||||
fedmsg_certs:
|
||||
|
|
|
@ -16,7 +16,7 @@ fas_client_groups: sysadmin-noc,sysadmin-badges,sysadmin-veteran
|
|||
fedmsg_error_recipients:
|
||||
- sysadmin-badges-members@fedoraproject.org
|
||||
|
||||
fedmsg_hub_memory_limit_mb: {{ (mem_size / 2) | int }}
|
||||
fedmsg_hub_memory_limit_mb: "{{ (mem_size / 2) | int }}"
|
||||
|
||||
# These are consumed by a task in roles/fedmsg/base/main.yml
|
||||
fedmsg_certs:
|
||||
|
|
|
@ -33,7 +33,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '
|
|||
|
||||
fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-mbs,sysadmin-veteran
|
||||
|
||||
fedmsg_hub_memory_limit_mb: {{ (mem_size / 2) | int }}
|
||||
fedmsg_hub_memory_limit_mb: "{{ (mem_size / 2) | int }}"
|
||||
|
||||
# These are consumed by a task in roles/fedmsg/base/main.yml
|
||||
fedmsg_certs:
|
||||
|
|
|
@ -35,7 +35,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '
|
|||
|
||||
fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-mbs,sysadmin-veteran
|
||||
|
||||
fedmsg_hub_memory_limit_mb: {{ (mem_size / 2) | int }}
|
||||
fedmsg_hub_memory_limit_mb: "{{ (mem_size / 2) | int }}"
|
||||
|
||||
# These are consumed by a task in roles/fedmsg/base/main.yml
|
||||
fedmsg_certs:
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
[Service]
|
||||
{% if fedmsg_hub_memory_limit_mb %}
|
||||
{% if fedmsg_hub_memory_limit_mb|int %}
|
||||
# Limit max RAM usage for fedmsg-hub. Also don't let fedmsg-hub use
|
||||
# more that half of swap available in the system, so that we don't get
|
||||
# Nagios alerts about low swap. We would rather have fedmsg-hub OOM
|
||||
|
@ -9,7 +9,7 @@ MemorySwapMax={{ (ansible_memory_mb.swap.total / 2) | int }}M
|
|||
MemoryMax={{fedmsg_hub_memory_limit_mb}}M
|
||||
{% else %}
|
||||
MemoryLimit={{fedmsg_hub_memory_limit_mb}}M
|
||||
LimitAS={{ (fedmsg_hub_memory_limit_mb + (ansible_memory_mb.swap.total / 2)) | int }}M
|
||||
LimitAS={{ (fedmsg_hub_memory_limit_mb|int + (ansible_memory_mb.swap.total / 2)) | int }}M
|
||||
{% endif %}
|
||||
{% endif %}
|
||||
|
||||
|
|
Loading…
Reference in New Issue