From 2513450d07a15b30f44af06a54ab0c016dc8e964 Mon Sep 17 00:00:00 2001 From: Geoff Jacobs Date: Wed, 30 Oct 2019 10:49:39 +1100 Subject: [PATCH] ITOPSENG-283 updating the method for managing the xmx and xms settings in setenv.sh --- roles/crowd_config/tasks/main.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/roles/crowd_config/tasks/main.yml b/roles/crowd_config/tasks/main.yml index f6e8493..ea31775 100644 --- a/roles/crowd_config/tasks/main.yml +++ b/roles/crowd_config/tasks/main.yml @@ -5,16 +5,19 @@ src: server.xml.j2 dest: "{{ atl_product_installation_versioned }}/apache-tomcat/conf/server.xml" -- name: Override JVM memory settings. - # Ugly but necessary as the product installs this file so we need to make the change here. +- name: Set the minimum heap size (Xms) lineinfile: path: "{{ atl_product_installation_versioned }}/apache-tomcat/bin/setenv.sh" - backrefs: true - regexp: "^{{ item }}=" - line: "{{ item }}=\"{{ atl_jvm_heap }}\"" - with_items: - - 'JVM_MINIMUM_MEMORY' - - 'JVM_MAXIMUM_MEMORY' + regexp: '^(.*)Xmx(\\d+\\w)(\\s.*)$' + line: '\1Xms${atl_jvm_heap}\3' + backrefs: yes + +- name: Set the maxmimum heap size (Xmx) + lineinfile: + path: "{{ atl_product_installation_versioned }}/apache-tomcat/bin/setenv.sh" + regexp: '^(.*)Xmx(\\d+\\w)(\\s.*)$' + line: '\1Xmx${xms}m\3' + backrefs: yes - name: Set Crowd home directory in crowd-init.properties file lineinfile: