Commit Graph

92 Commits

Author SHA1 Message Date
Gregor Zurowski
2fe6ff23b3 Fix naming of version_major and version_minor parameters in documentation.
Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
2016-10-18 16:10:56 +02:00
Hunter Haugen
06c3f9f112 Merge pull request #184 from ntpttr/fix/master/modules-2971
(MODULES-2971) Add java_home to all operating systems
2016-10-17 10:54:06 -07:00
Nate Potter
9df2f3d2a6 Change exec to file_line
This commit updates the setting of JAVA_HOME in /etc/environment
to be done with file_line rather than exec.
2016-10-14 09:10:53 -07:00
Gregor Zurowski
2a8236e6d1 Allow targeting specific major/minor Oracle JDK versions (#192)
* Allow targeting specific major/minor Oracle JDK versions

Expose two new parameters 'version_major' and 'version_minor' to
allow users targeting specific Oracle JDK versions.

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>

* Fix lint validation issues

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
2016-10-07 19:48:58 +02:00
ntpttr
9093da3b32 Update config.pp 2016-09-20 14:05:18 -07:00
ntpttr
3960227e60 Add unless clause to exec 2016-09-20 13:53:03 -07:00
Nate Potter
eb587a433e Change file resource to exec
This commit changes the way the JAVA_HOME variable is added to
/etc/environment from using a file resource to using an exec
resource. This way we can avoid resource conflicts with the
file.

Signed-off-by: Nate Potter <ntpttr@gmail.com>
2016-09-17 11:58:58 -07:00
Jinn Koriech
feb669f203 Support recent java versions > 8u99 built with make-jpkg 0.53
The previous make-jpkg from java-package_0.50 doesn't support building java
versions with three digits in the release number.  Therefore it has been
necessary to upgrade java-packaages to the newer 0.53 version.

Building oracle packages using the java-package tools 0.53 results in package
with a new naming scheme as compared to 0.50.  In particular where the packages
were previously named oracle-j2re1.8 they are now named oracle-java8-jre, while
oracle-j2dk1.8 has become oracle-java8-jdk.  The alternatives naming has also
changed.

We also need to handle the system architecture naming on debian systems where
Debian names it's 64bit architecture 'amd64' and Oracle use 'x64'.  This results
in the java_home path using x64 rather than amd64.  We need to handle this
variation while also accommodating all architectures, and only for the recent
packages.

Given this has only been tested on Ubuntu, and the make-jpkg tooling is managed
in the Debian flavour, the changes are only applied to that code branch.

Jinn Koriech & Doug Neal
2016-09-08 15:43:38 +01:00
RoboGi
9dbe1ce9bb Changed from operatingsystem to osfamily to match other RHEL derivitives such as Oracle Linux 2016-07-19 11:25:36 -07:00
Nate Potter
dd8f85a2fa (MODULES-2971) Add java_home to all operating systems
This patch adds the java_home variable to all supported
operating systemd, and gives the user the option to
set it themselves. It also updates config.pp to
ensure that the JAVA_HOME variable is set to
the desired java_home.
2016-07-16 21:32:26 -07:00
tphoney
c99b28bab0 {maint} modulesync 0794b2c 2016-06-30 14:38:10 +01:00
David Schmitt
124abf1278 Merge pull request #173 from edge-records/patch-1
custom archive type needs extract_path
2016-05-26 12:28:09 +01:00
edge-records
a74be5a7f8 Also support RedHat for Oracle Java
Works fine for me, tested on RHEL6.
2016-05-25 11:00:29 +01:00
edge-records
4f700ca1e3 custom archive type needs extract_path
archive type's extract_path doesn't have a default parameter and needs to be set (see https://github.com/voxpupuli/puppet-archive/blob/master/lib/puppet/type/archive.rb#L71-L78). If I don't set one I get the following error when trying to use this module:

Error: Failed to apply catalog: No title provided and :file is not a valid resource reference
2016-05-25 10:58:02 +01:00
Tyler Langlois
4b5cbc4d33 Update java package for SLES 11.4
As of SLES 11.4, Java 1.6 has been deprecated in favor of 1.7:
https://www.suse.com/releasenotes/x86_64/SLE-SDK/11-SP4/#fate-318121
2016-05-10 11:15:28 +01:00
Sebastian Gerhards
3d8d4d76e0 Fix typo in documentation for class oracle 2016-05-02 15:08:51 +02:00
Sergey Novikov
afcb95b10b Add Ubuntu 16.04 2016-03-31 18:30:26 +02:00
Hunter Haugen
749a735559 Merge pull request #159 from mmarseglia/master
Add support for official Oracle Java SE jdk and jre packages for CentOS
2016-03-02 10:08:57 -08:00
Joseph Yaworski
c8e46b5db2 Use java 8 as the default on RHEL > 7.0 2016-02-24 13:38:06 -05:00
Marseglia. Mike
06aecdb62a Add support for official Oracle Java SE jdk and jre packages for CentOS 2016-02-18 14:15:19 -05:00
Joe Ray
e6a026d3c8 Merge branch 'master' into allow-tildes-in-version 2016-02-05 15:23:03 +00:00
Joe Ray
3bb3f325b7 Allow tildes in version to support webupd8team's packages
See http://ppa.launchpad.net/webupd8team/java/ubuntu/pool/main/o/oracle-java8-installer/
2016-02-05 15:05:19 +00:00
TP Honey
5152c9c25e Merge pull request #151 from tux-o-matic/master
Can now pass options to package provider
2016-01-29 13:39:13 +00:00
Benjamin Merot
3842d6f657 Added possibility to pass options to package
Exposed the Puppet 'package' resource's 'install_options' parameter via a new class parameter names 'package_options*. It takes an array of strings to pass installation options to the package provider of the targer OS (yum, apt-get, ...)

Added validation of $package_options array

Using stdlib' validate_array function to ensure that $package_options is a valid array (also if just empty).

Cleaned array validation line

Made $package_options undef by default

Class parameter $package_options is now set to undef by default, validation is done in the class to ensure only an array would be passed to it if set.

Added case for 'package_options' parameter

Will test the use of the 'package_options' parameter being passed the YUM option --downloadonly which will see YUM return 0 but package will not be installed on system.

Simplified test of 'package_options' parameter

As the test 'select openjdk for Fedora 21 without installing' expects with a successful YUM run but the 'java' package not present, specifying package version is irrelevant.

New case for complete installation with YUM option

Added new case using 'package_options' with a a YUM option expected to not prevent rpm installation.
Also added distribution parameter for test of 'pacakge_options' with yum option expected to prevent package installation.

Removed validation of package name

Removed validation of package name as it is not meant to be testing by 'select passed value for Fedora 21 with yum option'

Removed test with '--downloadonly'

The test of 'package_options* with the YUM option '---downloadonly' can't seem to be validate in CI.
Other test 'select passed value for Fedora 21 with yum option' covers passing a value to 'package_options* and passes test in CI.
2016-01-29 10:57:24 +01:00
TP Honey
aee0f6bc3f Merge pull request #153 from petems/MODULES-2928-add_freebsd_support
(MODULES-2928) Adds FreeBSD Support
2015-12-29 14:46:32 +00:00
Peter Souter
f1f2b830a0 (MODULES-2928) Adds FreeBSD Support
* Note this won't work by default on FreeBSD Puppet < 4.0, as pkgng is not the default provider 
* On older Puppet, use `zleslie/pkgng`, on newer it's the default package provider.
2015-12-29 13:11:47 +00:00
thomas odukogbe
3a7ed12d49 Added support for oracle-j2re1.8 and oracle-j2sdk1.8 2015-12-21 11:27:45 +00:00
Oliver Chick
ca2171043e Add support for Ubuntu 15.10 2015-11-18 23:52:17 +00:00
Zach Reichert
e8b3dd534f Add OEL operatingsystem to java::params 2015-07-14 10:03:56 -07:00
Bryan Jen
cf0c56b06f Merge pull request #126 from danielparks/require-update-java-alternatives
Install update-java-alternatives on Debian for the java::config class
2015-07-02 12:27:05 -07:00
Bryan Jen
4aac413e04 (MODULES-2095) fixes create-java-alternatives command 2015-06-29 14:07:40 -07:00
Bryan Jen
bfc03a54c5 re-orders case statements in manifests to workaround PUP-4520. 2015-06-24 13:49:19 -07:00
Daniel Parks
75fa927d72 Install update-java-alternatives on Debian for the java::config class. 2015-06-22 22:15:14 -07:00
Sebastian Reitenbach
5815242f8e Add support for OpenBSD, and also add some regression tests.
Add info about OpenBSD support to README.md and metadata.json
Add a note about OpenBSD java_version fact to README.markdown.
Fixup wording on context in one of the java patch level regression tests.
No mentioning of OpenBSD in metdata.json

Cleanup wording of context as suggested by @elyscape
update contexts as suggested by @elyscape
2015-04-23 12:29:11 +02:00
Lutz Behnke
e22aa3a36a add support for ubuntu vivid (15.04) using openjdk-8
add acceptance test node without really understanding what it does.
add test for distribution type jdk for Ubuntu vivid
2015-04-01 08:16:07 +02:00
Scott K Logan
98447f03e7 Fix Fedora 21+ package name
java-1.7.0-openjdk is no longer available in Fedora 21+
2015-01-31 22:50:06 -08:00
Richard Pijnenburg
3b290abddf Use --jre-headless instead of --jre
In some cases it can cause problems and report these kind of errors:

$ update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64 --jre
update-alternatives: error: no alternatives for policytool
update-alternatives: error: no alternatives for policytool
2015-01-07 22:51:26 +00:00
rmenezes
0c2e8bb610 Add Java alternatives for RHEL based distros. 2014-12-26 15:10:37 -08:00
Colleen Murphy
89e3a04258 Merge pull request #91 from justinstoller/maint/master/lint-fix
variable best practice (stop yelling at me linter)
2014-12-03 09:41:19 -08:00
Justin Stoller
359528b7f9 variable best practice (stop yelling at me linter) 2014-12-02 16:00:48 -08:00
Patrick Hervieux
b04c8a9148 add utopic support 2014-11-14 15:41:02 +01:00
Morgan Haskel
d845e5fdd9 Merge pull request #76 from PierreR/patch-1
cosmetic: default in last position
2014-11-12 10:50:39 -08:00
Morgan Haskel
f95aad63a5 Revert "Add alternative support for RedHat" 2014-11-12 10:29:12 -08:00
Morgan Haskel
b00b4b8662 Merge pull request #61 from convectionlabs/master
Add alternative support for RedHat
2014-11-12 10:19:57 -08:00
Travis Fields
abad30de06 Update defaults for SLES
Fixed test issues with solaris-11 and added support for sles-12
2014-11-05 16:04:52 -08:00
Morgan Haskel
7224baa72d Merge pull request #64 from kian/master
place default case last in selectors
2014-10-29 18:48:16 -04:00
Pi3r
5ad98b17be Fix syntax 2014-09-01 14:39:24 +02:00
Pi3r
7580a25018 cosmetic: default in last position
The main motivation for this change is for compatibility with puppetresource (https://github.com/bartavelle/language-puppet).

IMHO, it makes much more sense this way because all cases are checked order wise.
2014-09-01 13:53:08 +02:00
Kian Mohageri
a04e88d658 place default case last in selectors
According to the selector documentation (https://docs.puppetlabs.com/puppet/latest/reference/lang_conditional.html#selectors), the default case should be last:

"Cases are compared in the order that they are written in the manifest; thus, the default case (if any) must be at the end of the list."

This is fixed in 3.7+ but would be nice to fix in this module for people using < 3.7

See also https://tickets.puppetlabs.com/browse/PUP-2642
2014-08-21 17:51:34 -07:00
Hunter Haugen
dcdc96187d Remove empty package test and validation
an empty variable is apparently the same thing as undef, which causes
the packages to be selected as usual.
2014-08-13 13:11:28 -07:00