From 292f7c22e097bd939159d28eb531d690b1de2b02 Mon Sep 17 00:00:00 2001
From: Eduardo Gonzalez <dabarren@gmail.com>
Date: Fri, 14 Sep 2018 19:29:08 +0200
Subject: [PATCH] Allow configure java params for ODL karaf

Allow configure memory limits as variables in ODL karaf
java instance.
Allows us to define smaller memory settings for CI
and bigger for prod environments.

Change-Id: I8cafaa543ad09572bdbb6af1bbbd65f55fe42f8c
---
 ansible/roles/opendaylight/defaults/main.yml   |  9 +++++++++
 ansible/roles/opendaylight/tasks/config.yml    | 10 ++++++----
 ansible/roles/opendaylight/templates/setenv.j2 |  4 ++--
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ansible/roles/opendaylight/defaults/main.yml b/ansible/roles/opendaylight/defaults/main.yml
index 42278c9857..8c6b9fb500 100644
--- a/ansible/roles/opendaylight/defaults/main.yml
+++ b/ansible/roles/opendaylight/defaults/main.yml
@@ -24,3 +24,12 @@ opendaylight_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ do
 opendaylight_tag: "{{ openstack_release }}"
 opendaylight_image_full: "{{ opendaylight_image }}:{{ opendaylight_tag }}"
 opendaylight_dimensions: "{{ default_container_dimensions }}"
+
+###################
+# Java Opts
+###################
+
+# JAVA_MAX_MEM param
+opendaylight_java_max_mem: "8g"
+# JAVA_MAX_PERM_MEM param
+opendaylight_java_max_perm_mem: "512m"
diff --git a/ansible/roles/opendaylight/tasks/config.yml b/ansible/roles/opendaylight/tasks/config.yml
index 2c94f29b26..921817497c 100644
--- a/ansible/roles/opendaylight/tasks/config.yml
+++ b/ansible/roles/opendaylight/tasks/config.yml
@@ -140,13 +140,15 @@
 
 - name: Copying over setenv
   template:
-    src: "{{ role_path }}/templates/setenv.j2"
-    dest: "{{ node_config_directory }}/{{ item }}/setenv"
+    src: "{{ item }}"
+    dest: "{{ node_config_directory }}/opendaylight/setenv"
     mode: "0660"
   become: true
   register: opendaylight_config_env
-  with_items:
-    - "opendaylight"
+  with_first_found:
+    - "{{ node_custom_config }}/opendaylight/{{ inventory_hostname }}/setenv"
+    - "{{ node_custom_config }}/opendaylight/setenv"
+    - "{{ role_path }}/templates/setenv.j2"
   notify:
     - Restart opendaylight container
 
diff --git a/ansible/roles/opendaylight/templates/setenv.j2 b/ansible/roles/opendaylight/templates/setenv.j2
index 7376186e18..9696717602 100644
--- a/ansible/roles/opendaylight/templates/setenv.j2
+++ b/ansible/roles/opendaylight/templates/setenv.j2
@@ -17,8 +17,8 @@
 #
 
 if [ "x$JAVA_MAX_PERM_MEM" = "x" ]; then
-    export JAVA_MAX_PERM_MEM="512m"
+    export JAVA_MAX_PERM_MEM="{{ opendaylight_java_max_perm_mem }}"
 fi
 if [ "x$JAVA_MAX_MEM" = "x" ]; then
-    export JAVA_MAX_MEM="8g"
+    export JAVA_MAX_MEM="{{ opendaylight_java_max_mem }}"
 fi