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
This commit is contained in:
Eduardo Gonzalez 2018-09-14 19:29:08 +02:00
parent 8219542f89
commit 292f7c22e0
3 changed files with 17 additions and 6 deletions

View File

@ -24,3 +24,12 @@ opendaylight_image: "{{ docker_registry ~ '/' if docker_registry else '' }}{{ do
opendaylight_tag: "{{ openstack_release }}" opendaylight_tag: "{{ openstack_release }}"
opendaylight_image_full: "{{ opendaylight_image }}:{{ opendaylight_tag }}" opendaylight_image_full: "{{ opendaylight_image }}:{{ opendaylight_tag }}"
opendaylight_dimensions: "{{ default_container_dimensions }}" 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"

View File

@ -140,13 +140,15 @@
- name: Copying over setenv - name: Copying over setenv
template: template:
src: "{{ role_path }}/templates/setenv.j2" src: "{{ item }}"
dest: "{{ node_config_directory }}/{{ item }}/setenv" dest: "{{ node_config_directory }}/opendaylight/setenv"
mode: "0660" mode: "0660"
become: true become: true
register: opendaylight_config_env register: opendaylight_config_env
with_items: with_first_found:
- "opendaylight" - "{{ node_custom_config }}/opendaylight/{{ inventory_hostname }}/setenv"
- "{{ node_custom_config }}/opendaylight/setenv"
- "{{ role_path }}/templates/setenv.j2"
notify: notify:
- Restart opendaylight container - Restart opendaylight container

View File

@ -17,8 +17,8 @@
# #
if [ "x$JAVA_MAX_PERM_MEM" = "x" ]; then 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 fi
if [ "x$JAVA_MAX_MEM" = "x" ]; then if [ "x$JAVA_MAX_MEM" = "x" ]; then
export JAVA_MAX_MEM="8g" export JAVA_MAX_MEM="{{ opendaylight_java_max_mem }}"
fi fi