Commit Graph
211 Commits
Author SHA1 Message Date
Colleen Murphy 44a1992e83 Keep testing on puppet 2.7
The modulesync config repo is dropping universal support for puppet
2.7, but individual repos should still keep support until the next
naturally-occuring major release.
2015-03-23 12:12:38 -07:00
Colleen Murphy d0a03f66c7 Ensure lint fails on warnings 2015-03-19 14:10:09 -07:00
Colleen Murphy ce5529a03d Remove unneeded dependencies
puppetlabs_spec_helper handles these dependencies for us.
2015-03-19 14:10:03 -07:00
Colleen Murphy 5b45d1fede Update rspec tests for rspec-puppet 2
This patch uses `catalogue` instead of `subject` for the raise_error
matcher since `subject` is not evaluated the way it used to be. We also
unpin rspec-puppet.
2015-03-19 14:09:58 -07:00
Morgan Haskel 7a39d596bd Merge pull request #113 from jtappa/readme-edits
Edits to param descriptions and other small changes in the README.
2015-03-06 15:54:10 -08:00
Jorie Tappa 75fb20d0eb Edits to params and other small changes.
params are now alphabetized, descriptions are mostly the same but now
all include valid options and defaults.
2015-03-06 15:51:49 -08:00
TP Honey 87ac311761 Merge pull request #110 from antaflos/patch-1
Extend Limitations section
2015-02-26 10:36:35 +00:00
Andreas Ntaflos 412f80a7ba Extend Limitations section
Add note that this module doesn't support managing multiple Java installations in parallel.
2015-02-22 21:08:06 +01:00
Colleen Murphy 9861651c02 Merge pull request #107 from elyscape/fix/improve_java_version_fact
Improve java_version fact maintainability
2015-02-12 11:51:09 -08:00
Eli Young 8dd715a599 Improve java_version fact maintainability 2015-02-09 15:26:53 -08:00
Morgan Haskel 97b48f12d1 Merge pull request #104 from cottsay/master
Fix Fedora 21+ package name
2015-02-06 18:46:22 +01:00
Morgan Haskel 1a53dd3ff4 Merge pull request #106 from petems/improve_java_version_fact_with_args
(MODULES-1749) Update java_version fact with maximum memory size
2015-02-06 16:24:51 +01:00
Oliver FalkandPeter Souter 79805000cc (MODULES-1749) Update java_version fact...
with maximum memory size

Add -Xmx8m to make large systems happy.
2015-02-06 12:47:23 +00:00
Hunter Haugen 3124798492 Merge pull request #105 from cmurphy/rspec
Pin rspec gems
2015-02-04 12:03:31 -08:00
Colleen Murphy 65010255b6 Pin rspec gems 2015-02-04 17:02:04 +01: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
Hunter Haugen b01d529af3 Merge pull request #100 from mhaskel/merge_1.3.x_to_master
Merge 1.3.x to master
2015-01-20 10:25:58 -08:00
Hunter Haugen fcdb14eb75 Merge pull request #99 from mhaskel/1.3.0-prep
1.3.0 prep
1.3.0
2015-01-16 15:41:27 -08:00
Morgan Haskel b8978a4e63 1.3.0 prep 2015-01-16 15:34:36 -08:00
Jean B. aba179a935 Merge pull request #98 from mhaskel/missed_docs
Add missing docs for new facts
2015-01-16 15:18:49 -08:00
Morgan Haskel cb54efbc34 Add missing docs for new facts 2015-01-16 15:11:51 -08:00
Hunter Haugen b138633c4e Merge pull request #92 from petems/MODULES-1570-java_version_facts
MODULES-1570 Java Version facts
2015-01-08 09:03:53 -08:00
Peter Souter 46524ee6eb (MODULES-1570) Stub exec for older Facter
Otherwise this spec will fail with

```
Mocha::ExpectationError:
unexpected invocation: Facter::Util::Resolution.which('uname')
```
2015-01-08 08:27:56 -08:00
Hunter Haugen 4b6ddc7204 Merge pull request #97 from electrical/jreheadless
Use --jre-headless instead of --jre
2015-01-07 16:53:02 -08:00
Peter SouterandPeter Souter cd3ac1ee46 (MODULES-1570) Add java_major_version fact
Gives the major version of the Java release (ie. Java 1.7.0_71, major version is 7)

We also want to specifically return nil when java not present
2015-01-07 15:42:23 -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
Travis Fields 55ca769bc2 Merge pull request #96 from mhaskel/wheezy_test_fix
Acceptance test fix for wheezy
2014-12-29 17:28:00 -08:00
Morgan Haskel 619cdf99c4 Acceptance test fix for wheezy 2014-12-29 17:13:06 -08:00
Morgan Haskel bac6b37e64 Merge pull request #95 from cmurphy/master
Sync with modulesync
2014-12-29 11:21:17 -08:00
Colleen Murphy dbcab7df53 Sync with modulesync 2014-12-29 10:58:10 -08:00
Hunter Haugen a0807a8c33 Merge pull request #94 from mhaskel/test_fix_89
Test fix for RHEL with alternatives
2014-12-29 09:56:34 -08:00
Morgan Haskel ee9d955eeb Test fix for RHEL with alternatives
Alternatives support was added in #89, but the test wasn't updated to
expect failures when invalid alternatives are passed to RHEL systems.
2014-12-29 09:53:03 -08:00
Peter Souter 5168f61c26 (MODULES-1570) Improve variable names
Lets keep it vaguely consistent
2014-12-29 15:13:47 +00:00
Peter Souter ea4717ea29 (MODULES-1570) java_patch_level fact
Uses the `java_version` fact and gets the patch level by splitting after `_`

This would be useful if you want to make sure you're not accidentally downgrading the version of Java to a lower patch level (I've noticed some package managers don't notice this too well)
2014-12-29 15:13:47 +00:00
Peter Souter 8724592f2b (MODULES-1570) java_version fact
Adapted from the many found on Github, simply runs `java -version` and strips the results. From what I can find there aren't many edge cases for the result `java -version 2>&1` could return, so this should be fairly compatible.
2014-12-29 15:13:47 +00:00
Peter Souter 378dcc7802 (MODULES-1570) TDD Style - Add specs first
Facter unit tests to check resolution of Java version
2014-12-29 15:13:47 +00:00
Travis Fields 16ec5a40a7 Merge pull request #93 from mhaskel/modulesync
Sync files with modulesync
2014-12-26 16:39:23 -08:00
Morgan Haskel dcc2867152 Merge pull request #89 from brdude/master
Add Java alternatives for RHEL based distros.
2014-12-26 15:55:56 -08:00
rmenezes 0c2e8bb610 Add Java alternatives for RHEL based distros. 2014-12-26 15:10:37 -08:00
Morgan Haskel c660622b82 Sync files with modulesync 2014-12-26 10:58:14 -08:00
Morgan Haskel 8fdcc1a2e1 Merge pull request #90 from jbondpdx/master
FM-1523: Added module summary to metadata.json
2014-12-19 15:58:18 -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
Morgan Haskel bb2d01bf13 Merge pull request #88 from phervieux/utopic
add utopic support
2014-12-02 16:43:36 -05:00
jbondpdx 4274f4f147 FM-1523: Added module summary to metadata.json 2014-11-20 15:50:07 -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 601c948ae0 Merge pull request #80 from stevenalexander/trival-readme-md-point-correction
cosmetic change to add missing space to bullet point in markdown so it r...
2014-11-12 10:48:30 -08:00
Morgan Haskel fc369fb2f7 Merge pull request #87 from puppetlabs/revert-61-master
Revert "Add alternative support for RedHat"
2014-11-12 10:30:07 -08:00
Morgan Haskel f95aad63a5 Revert "Add alternative support for RedHat" 2014-11-12 10:29:12 -08:00