From cf6059b115cf29cec3bbd8124b123896c4386f6b Mon Sep 17 00:00:00 2001 From: Kozakowski Karol Date: Thu, 3 Dec 2015 10:55:34 +0100 Subject: [PATCH 1/2] bugfix/21 hiera key jboss::params::java_install is depracted now, use jboss::params::java_autoinstall --- manifests/internal/quirks/autoinstall.pp | 10 ++++++++++ manifests/params.pp | 6 +++++- 2 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 manifests/internal/quirks/autoinstall.pp diff --git a/manifests/internal/quirks/autoinstall.pp b/manifests/internal/quirks/autoinstall.pp new file mode 100644 index 0000000..3cacc3e --- /dev/null +++ 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 index 7dabb73..9499703 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -7,8 +7,12 @@ # Version of JBoss Application Server $version = hiera('jboss::params::version', '8.2.0.Final') + # Deprcated, will deleted in next major version + include jboss::internal::quirks::autoinstall + # Should java be installed by this module automatically? - $java_autoinstall = jboss_to_bool(hiera('jboss::params::java_install', 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') From 9116d4b57ee34eb00f81c485508d1337bb7dcfe6 Mon Sep 17 00:00:00 2001 From: Kozakowski Karol Date: Thu, 3 Dec 2015 11:00:23 +0100 Subject: [PATCH 2/2] bugfix/21 default value is now in comment --- manifests/params.pp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/manifests/params.pp b/manifests/params.pp index 9499703..9654afe 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -10,9 +10,10 @@ # Deprcated, will deleted in next major version include jboss::internal::quirks::autoinstall - # Should java be installed by this module automatically? + # 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)) + $jboss::internal::quirks::autoinstall::deprecated_java_install)) # The version of Java to be installed, default: latest $java_version = hiera('jboss::params::java_version', 'latest')