Merge "Add provision to specify java arguments to ODL" into stable/queens

puppet/services/opendaylight-api.yaml

@@ -87,6 +87,13 @@ parameters:
     type: string
     description: Specifies the default CA cert to use if TLS is used for
                  services in the internal network.
+  OpenDaylightJavaOpts:
+    default: ''
+    type: string
+    description: Specifies the Java options to run ODL with as a string.
+                 Note, these options are in addition to the default Java
+                 options set by the karaf/ODL boot scripts and IP version
+                 based flag set by 'opendaylight' class.
 
 parameter_groups:
 - label: deprecated
@@ -139,6 +146,7 @@ outputs:
                   - 8185
             opendaylight::snat_mechanism: {get_param: OpenDaylightSNATMechanism}
             opendaylight::log_mechanism: {get_param: OpenDaylightLogMechanism}
+            opendaylight::java_opts: {get_param: OpenDaylightJavaOpts}
           -
             if:
               - internal_tls_enabled

releasenotes/notes/set_java_opts_from_tripleo-d969b1151ec244a0.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    Add provision to set java options like heap size configurations in ODL.