diff --git a/roles/web-app-confluence/vars/main.yml b/roles/web-app-confluence/vars/main.yml index da723495..3357ea8d 100644 --- a/roles/web-app-confluence/vars/main.yml +++ b/roles/web-app-confluence/vars/main.yml @@ -35,7 +35,7 @@ CONFLUENCE_CUSTOM_IMAGE: "{{ CONFLUENCE_IMAGE }}_custom" ## Performance CONFLUENCE_TOTAL_MB: "{{ ansible_memtotal_mb | int }}" -CONFLUENCE_JVM_MAX_MB: "{{ [ (CONFLUENCE_TOTAL_MB // 2), 12288 ] | min }}" -CONFLUENCE_JVM_MIN_MB: "{{ [ (CONFLUENCE_TOTAL_MB // 4), CONFLUENCE_JVM_MAX_MB ] | min }}" +CONFLUENCE_JVM_MAX_MB: "{{ [ (CONFLUENCE_TOTAL_MB | int // 2), 12288 ] | min }}" +CONFLUENCE_JVM_MIN_MB: "{{ [ (CONFLUENCE_TOTAL_MB | int // 4), (CONFLUENCE_JVM_MAX_MB | int) ] | min }}" CONFLUENCE_JVM_MIN: "{{ CONFLUENCE_JVM_MIN_MB }}m" CONFLUENCE_JVM_MAX: "{{ CONFLUENCE_JVM_MAX_MB }}m" \ No newline at end of file diff --git a/roles/web-app-jira/vars/main.yml b/roles/web-app-jira/vars/main.yml index 5d63ab9d..02658555 100644 --- a/roles/web-app-jira/vars/main.yml +++ b/roles/web-app-jira/vars/main.yml @@ -35,7 +35,7 @@ JIRA_CUSTOM_IMAGE: "{{ JIRA_IMAGE }}_custom" ## Performance (auto-derive from host memory) JIRA_TOTAL_MB: "{{ ansible_memtotal_mb | int }}" -JIRA_JVM_MAX_MB: "{{ [ (JIRA_TOTAL_MB // 2), 12288 ] | min }}" -JIRA_JVM_MIN_MB: "{{ [ (JIRA_TOTAL_MB // 4), JIRA_JVM_MAX_MB ] | min }}" +JIRA_JVM_MAX_MB: "{{ [ (JIRA_TOTAL_MB | int // 2), 12288 ] | min }}" +JIRA_JVM_MIN_MB: "{{ [ (JIRA_TOTAL_MB | int // 4), (JIRA_JVM_MAX_MB | int) ] | min }}" JIRA_JVM_MIN: "{{ JIRA_JVM_MIN_MB }}m" JIRA_JVM_MAX: "{{ JIRA_JVM_MAX_MB }}m" \ No newline at end of file