Merge pull request #23 from coi-gov-pl/bugfix/21-fix_java_autoinstall…

…_parameter bugfix/21 hiera key jboss::params::java_install is depracted now, use…
coi-gov-pl · Dec 8, 2015 · 3f93424 · 3f93424
2 parents 20331b9 + e07aed7
commit 3f93424
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/manifests/internal/quirks/autoinstall.pp b/manifests/internal/quirks/autoinstall.pp
@@ -0,0 +1,10 @@
+# == Class: jboss::internal::quirks::autoinstall
+# Deprcated, will deleted in next major version
+class jboss::internal::quirks::autoinstall {
+  $dep_key                = 'jboss::params::java_install'
+  $is_set                 = hiera($dep_key, undef)
+  if $is_set != undef {
+    warning("Hiera key ${dep_key} is deprecated, please use jboss::params::java_autoinstall instead.")
+  }
+  $deprecated_java_install = jboss_to_bool(hiera($dep_key, true))
+}
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -7,8 +7,13 @@
   # Version of JBoss Application Server
   $version          = hiera('jboss::params::version', '8.2.0.Final')
 
-  # Should java be installed by this module automatically?
-  $java_autoinstall = jboss_to_bool(hiera('jboss::params::java_install', true))
+  # Deprcated, will deleted in next major version
+  include jboss::internal::quirks::autoinstall
+
+  # Should java be installed by this module automatically?,
+  # Default value is set to true
+  $java_autoinstall = jboss_to_bool(hiera('jboss::params::java_autoinstall',
+  $jboss::internal::quirks::autoinstall::deprecated_java_install))
 
   # The version of Java to be installed, default: latest
   $java_version     = hiera('jboss::params::java_version', 'latest')