Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Try different way of passing memory limit

Browse source 
This reverts commit 830c854cf7.
This commit is contained in:
Mikolaj Izdebski 2019-02-21 18:52:25 +01:00
parent 830c854cf7
commit 7840c992cc
5 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/badges-backend
View file

@ -16,7 +16,7 @@ fas_client_groups: sysadmin-noc,sysadmin-badges,sysadmin-veteran
fedmsg_error_recipients: fedmsg_error_recipients:
- sysadmin-badges-members@fedoraproject.org - 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 # These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs: fedmsg_certs:

2
inventory/group_vars/badges-backend-stg
View file

@ -16,7 +16,7 @@ fas_client_groups: sysadmin-noc,sysadmin-badges,sysadmin-veteran
fedmsg_error_recipients: fedmsg_error_recipients:
- sysadmin-badges-members@fedoraproject.org - 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 # These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs: fedmsg_certs:

2
inventory/group_vars/odcs-backend
View file

@ -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 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 # These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs: fedmsg_certs:

2
inventory/group_vars/odcs-backend-stg
View file

@ -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 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 # These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs: fedmsg_certs:

4
roles/fedmsg/hub/templates/fedmsg-hub-systemd.conf.j2
View file

@ -1,5 +1,5 @@
[Service] [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 # 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 # 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 # 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 MemoryMax={{fedmsg_hub_memory_limit_mb}}M
{% else %} {% else %}
MemoryLimit={{fedmsg_hub_memory_limit_mb}}M 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 %}
{% endif %} {% endif %}