Allow setting java_opts only

README.md

@@ -21,6 +21,7 @@
     * [to 1.2.0](#to-120)
     * [to 2.0.0](#to-200)
     * [to 2.1.0](#to-210)
+    * [to 4.0.0](#to-400)
 5. [Usage - Configuration options and additional functionality](#usage)
     * [Wildfly 25.0.0](#wildfly-2500)
     * [Wildfly 23.0.2](#wildfly-2302)
@@ -122,6 +123,40 @@ class { 'wildfly':
 
 `users_mgmt` was replaced by `mgmt_user`, and additional users should be managed by `wildfly::config::mgtm_user` defined type. The hash format and default value also changed.
 
+## to 4.0.0
+
+### wildfly class
+
+The parameters `java_xms`, `java_xmx` and `java_maxmetaspace_size` are now optional and default to `undef`.
+There are now two options to specify `java_opts`:
+
+1. specify each of the mentioned parameters or
+1. add all parameters to java\_opts parameter
+
+Example using specific values for undef parameters:
+
+```puppet
+class { 'wildfly':
+  java_xms               => '2G',
+  java_xmx               => '2G',
+  java_maxmetaspace_size => '2G',
+  java_opts              => '-XX:Foo=4',
+}
+```
+
+Example using the `java_opts` parameter only:
+
+```puppet
+class { 'wildfly':
+  java_opts => [
+    '-Xms 2G',
+    '-Xmx 2G',
+    '-XX:MaxMetaspaceSize=2G',
+    '-XX:Foo=4',
+  ],
+}
+```
+
 ### New dependency
 
 `jethrocarr/initfact` module.

REFERENCE.md

@@ -299,27 +299,27 @@ Default value: `undef`
 
 ##### <a name="-wildfly--java_xmx"></a>`java_xmx`
 
-Data type: `String`
+Data type: `Optional[String[1]]`
 
 Sets Java's `-Xmx` parameter.
 
-Default value: `'512m'`
+Default value: `undef`
 
 ##### <a name="-wildfly--java_xms"></a>`java_xms`
 
-Data type: `String`
+Data type: `Optional[String[1]]`
 
 Sets Java's `-Xms` parameter.
 
-Default value: `'256m'`
+Default value: `undef`
 
 ##### <a name="-wildfly--java_maxmetaspace_size"></a>`java_maxmetaspace_size`
 
-Data type: `String`
+Data type: `Optional[String[1]]`
 
 Sets Java's `-XX:MaxMetaspaceSize` parameter.
 
-Default value: `'128m'`
+Default value: `undef`
 
 ##### <a name="-wildfly--jboss_opts"></a>`jboss_opts`
 

manifests/init.pp

@@ -81,9 +81,6 @@
   Wildfly::Config_file                               $config                       = 'standalone.xml',
   Wildfly::Config_file                               $domain_config                = 'domain.xml',
   Wildfly::Config_file                               $host_config                  = 'host.xml',
-  String                                             $java_xmx                     = '512m',
-  String                                             $java_xms                     = '256m',
-  String                                             $java_maxmetaspace_size       = '128m',
   String                                             $package_ensure               = 'present',
   Boolean                                            $service_ensure               = true,
   Boolean                                            $service_manage               = true,
@@ -121,6 +118,9 @@
   Optional[String]                                   $remote_username              = undef,
   Optional[String]                                   $package_name                 = undef,
   Optional[String]                                   $package_version              = undef,
+  Optional[String[1]]                                $java_xmx                     = undef,
+  Optional[String[1]]                                $java_xms                     = undef,
+  Optional[String[1]]                                $java_maxmetaspace_size       = undef,
   Variant[Undef, String, Array]                      $java_opts                    = undef,
   Variant[Undef, String, Array]                      $process_controller_java_opts = undef,
   Variant[Undef, String, Array]                      $host_controller_java_opts    = undef,

templates/domain.conf.epp

@@ -42,7 +42,16 @@ fi
 # Specify options to pass to the Java VM.
 #
 if [ "x$JAVA_OPTS" = "x" ]; then
-    JAVA_OPTS="-Xms<%= $wildfly::java_xms %> -Xmx<%= $wildfly::java_xmx %> -XX:MaxMetaspaceSize=<%= $wildfly::java_maxmetaspace_size %>"
+    JAVA_OPTS=$JAVA_OPTS"
+<%- if $wildfly::java_xms { -%>
+    JAVA_OPTS="$JAVA_OPTS -Xms <%= $wildfly::java_xms %>"
+<%- } -%>
+<%- if $wildfly::java_xmx { -%>
+    JAVA_OPTS="$JAVA_OPTS -Xmx <%= $wildfly::java_xmx %>"
+<%- } -%>
+<%- if $wildfly::java_maxmetaspace_size { -%>
+    JAVA_OPTS="$JAVA_OPTS -XX:MaxMetaspaceSize=<%= $wildfly::java_maxmetaspace_size %>"
+<%- } -%>
     JAVA_OPTS="$JAVA_OPTS <% if $wildfly::java_opts =~ Array { -%>
 <%= $wildfly::java_opts.join(" ") -%>
 <% } elsif $wildfly::java_opts =~ String { -%>

templates/standalone.conf.epp

@@ -47,8 +47,21 @@ fi
 # Specify options to pass to the Java VM.
 #
 if [ "x$JAVA_OPTS" = "x" ]; then
-   JAVA_OPTS="-Xms<%= $wildfly::java_xms %> -Xmx<%= $wildfly::java_xmx %> -XX:MaxMetaspaceSize=<%= $wildfly::java_maxmetaspace_size %>"
-   JAVA_OPTS="$JAVA_OPTS <%= $wildfly::java_opts %>"
+  JAVA_OPTS="$JAVA_OPTS"
+<%- if $wildfly::java_xms { -%>
+   JAVA_OPTS="$JAVA_OPTS -Xms<%= $wildfly::java_xms %>"
+<%- } -%>
+<%- if $wildfly::java_xmx { -%>
+   JAVA_OPTS="$JAVA_OPTS -Xmx<%= $wildfly::java_xmx %>"
+<%- } -%>
+<%- if $wildfly::java_maxmetaspace_size { -%>
+   JAVA_OPTS="$JAVA_OPTS -XX:MaxMetaspaceSize=<%= $wildfly::java_maxmetaspace_size %>"
+<%- } -%>
+   JAVA_OPTS="$JAVA_OPTS <% if $wildfly::java_opts =~ Array { -%>
+<%= $wildfly::java_opts.join(" ") -%>
+<% } elsif $wildfly::java_opts =~ String { -%>
+<%= $wildfly::java_opts -%>
+<% } -%>"
 else
    echo "JAVA_OPTS already set in environment; overriding default settings with values: $JAVA_OPTS"
 fi