Skip to content

Commit

Permalink
Merge pull request jhoblitt#45 from jhoblitt/feature/v2.5.0
Browse files Browse the repository at this point in the history
Feature/v2.5.0
  • Loading branch information
Joshua Hoblitt committed Oct 14, 2015
2 parents 0d434ce + 0a288b9 commit c6f5f18
Show file tree
Hide file tree
Showing 8 changed files with 132 additions and 4 deletions.
101 changes: 101 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,106 @@

#### [Current]
* [2481760](../../commit/2481760) - __(Joshua Hoblitt)__ fixup! fix trailing whitespace
* [e772a6a](../../commit/e772a6a) - __(Joshua Hoblitt)__ update rspec-puppet gem version to ~> 2.2

For bugfixes and to allow the 2.x version to float as the API stability has
been better than with the 1.x series.

* [570ee00](../../commit/570ee00) - __(Joshua Hoblitt)__ remove default nodset symlink

To resolve this PMT error:
Puppet::ModuleTool::Errors::ModuleToolError: Found symlinks. Symlinks in modules are not allowed, please remove them.

* [d39f0ad](../../commit/d39f0ad) - __(Joshua Hoblitt)__ add centos 5.11 nodeset
* [2f8b7ca](../../commit/2f8b7ca) - __(Joshua Hoblitt)__ add puppet-blacksmith gem
* [fe81f90](../../commit/fe81f90) - __(Joshua Hoblitt)__ add travis_lint rake target
* [78d0124](../../commit/78d0124) - __(Joshua Hoblitt)__ add debian 7.8 nodeset
* [49490d8](../../commit/49490d8) - __(Joshua Hoblitt)__ fix trailing whitespace
* [0d434ce](../../commit/0d434ce) - __(Joshua Hoblitt)__ Merge pull request [#43](../../issues/43) from queeno/manage_service_and_dont_attempt_to_stop

Manage smartd service and don't attempt to stop if package is absent
* [6802d4f](../../commit/6802d4f) - __(Joshua Hoblitt)__ Merge pull request [#44](../../issues/44) from liv3d/fix_groups

Fix default group for FreeBSD
* [2f976f1](../../commit/2f976f1) - __(Dan Offord)__ Fix default group for FreeBSD

By default FreeBSD doesn't have a root group, instead has a wheel group
instead. This commit changes the default group to call $::gid and fixes
the spec tests so it knows about the default group for each O/S (either
root or wheel)

* [19be823](../../commit/19be823) - __(Simon Aquino)__ Added unit tests for the $manage_service functionality

I've added and amended some unit tests in order to check the
$manage_service functionality introduced in previous commits.

* [8b633d9](../../commit/8b633d9) - __(Simon Aquino)__ Fix wrong parameter name in params.pp

It should be $manage_service not $service_manage!

* [d5ce6ce](../../commit/d5ce6ce) - __(Simon Aquino)__ Don't manage the smartd service when ensure => absent

If the smartd package is not installed, puppet will attempt to stop
a service that doesn't exist. For this reason, the smartd service should
not be managed if ensure is set to absent or purged.
If smartd is getting uninstalled, the deb script will take care to stop
the service anyway.

* [8e0f4bc](../../commit/8e0f4bc) - __(Simon Aquino)__ Allow users to manage the smartd service

The smartd service resource has been wrapped in an if statement and
controlled by the $manage_service parameter, so that a user of the
module can choose manage the service externally.

* [7ed901e](../../commit/7ed901e) - __(Joshua Hoblitt)__ add ruby 2.2 to travis matrix
* [cae2a8a](../../commit/cae2a8a) - __(Joshua Hoblitt)__ Merge pull request [#42](../../issues/42) from jhoblitt/feature/puppet-4.0

Feature/puppet 4.0
* [f7991ae](../../commit/f7991ae) - __(Joshua Hoblitt)__ add bundler_args to .travis.yml
* [62c91d7](../../commit/62c91d7) - __(Joshua Hoblitt)__ add :validate to default rake target list
* [5859be6](../../commit/5859be6) - __(Joshua Hoblitt)__ add metadata-json-lint gem

Needed by rake metadata.json validation target.

* [83bbcb3](../../commit/83bbcb3) - __(Joshua Hoblitt)__ fix puppet 4.0 type compatibility issues
* [7f67f6b](../../commit/7f67f6b) - __(Joshua Hoblitt)__ clone shell_config repo to github

Needed to fix fixtures git clone option compatibility issues.

* [27e37a1](../../commit/27e37a1) - __(Joshua Hoblitt)__ set stdlib requirement to 4.6.0
* [3ffe96b](../../commit/3ffe96b) - __(Joshua Hoblitt)__ update travis matrix puppet 3.x minimum version to 3.7
* [91e420e](../../commit/91e420e) - __(Joshua Hoblitt)__ update rspec-puppet gem version to ~> 2.1.0

For compatibility with puppet 4.0.0

* [62739bf](../../commit/62739bf) - __(Joshua Hoblitt)__ add junit/ to .gitiginore

Generated by beaker 5

* [72de891](../../commit/72de891) - __(Joshua Hoblitt)__ add puppet 4.0 to travis matrix
* [9219718](../../commit/9219718) - __(Joshua Hoblitt)__ remove puppet 2.7 from travis matrix

4.0.0 has been released; support major release -1

* [3d1a500](../../commit/3d1a500) - __(Joshua Hoblitt)__ update beaker nodesets to use current chef/bento boxes
* [164b114](../../commit/164b114) - __(Joshua Hoblitt)__ add log/ to .gitignore

Generated by beaker during execution.

* [646933b](../../commit/646933b) - __(Joshua Hoblitt)__ remove ruby 2.2 from travis matrix

Per https://github.com/puppetlabs/puppet/pull/3522#issuecomment-72404469 ,
puppet 3.7.x will not support ruby 2.2.

* [2404339](../../commit/2404339) - __(Joshua Hoblitt)__ pin rspec on Ruby 1.8.7 (rspec/rspec-core[#1864](../../issues/1864))
* [a37bf31](../../commit/a37bf31) - __(Joshua Hoblitt)__ use rspec-puppet 2.0.0 from gems instead of git
* [fac6dac](../../commit/fac6dac) - __(Joshua Hoblitt)__ add FACTER_GEM_VERSION to Gemfile

#### v2.4.0
* [0369686](../../commit/0369686) - __(Joshua Hoblitt)__ Merge pull request [#41](../../issues/41) from jhoblitt/feature/v2.4.0

Feature/v2.4.0
* [9e651a2](../../commit/9e651a2) - __(Joshua Hoblitt)__ bump version to v2.4.0
* [b469715](../../commit/b469715) - __(Joshua Hoblitt)__ update Rakefile boilerplate
* [9b3c52c](../../commit/9b3c52c) - __(Joshua Hoblitt)__ replace Modulefile vs metadata.json
* [9311cbe](../../commit/9311cbe) - __(Joshua Hoblitt)__ update fixtures stdlib to 4.2.0
Expand Down
4 changes: 3 additions & 1 deletion Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ group :development, :test do
gem 'puppetlabs_spec_helper', :require => false
gem 'puppet-lint', '>= 1.1.0', :require => false
gem 'puppet-syntax', :require => false
gem 'rspec-puppet', '~> 2.1.0', :require => false
gem 'rspec-puppet', '~> 2.2', :require => false
gem 'metadata-json-lint', :require => false
end

Expand All @@ -28,6 +28,8 @@ group :beaker do
gem 'beaker', :require => false
gem 'beaker-rspec', :require => false
gem 'pry', :require => false
gem 'travis-lint', :require => false
gem 'puppet-blacksmith', :require => false
end

# vim:ft=ruby
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -388,4 +388,3 @@ See Also
--------

* [`smartmontools`](http://smartmontools.sourceforge.net/)

9 changes: 9 additions & 0 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,22 @@ require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-syntax/tasks/puppet-syntax'
require 'puppet-lint/tasks/puppet-lint'

begin
require 'puppet_blacksmith/rake_tasks'
rescue LoadError
end

PuppetSyntax.exclude_paths = ['spec/fixtures/**/*']

PuppetLint::RakeTask.new :lint do |config|
config.pattern = 'manifests/**/*.pp'
config.fail_on_warnings = true
end

task :travis_lint do
sh "travis-lint"
end

task :default => [
:validate,
:lint,
Expand Down
9 changes: 9 additions & 0 deletions spec/acceptance/nodesets/centos-5.11.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HOSTS:
centos-5.11:
roles:
- master
platform: el-5-x86_64
box: chef/centos-5.11
hypervisor: vagrant
CONFIG:
type: foss
9 changes: 9 additions & 0 deletions spec/acceptance/nodesets/debian-7.8.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
HOSTS:
debian-7.8:
roles:
- master
platform: debian-7-amd64
box: chef/debian-7.8
hypervisor: vagrant
CONFIG:
type: foss
1 change: 0 additions & 1 deletion spec/acceptance/nodesets/default.yml

This file was deleted.

2 changes: 1 addition & 1 deletion spec/acceptance/nodesets/fedora-21.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ HOSTS:
roles:
- master
platform: fedora-21-x86_64
box: chef/fedora-21
box: chef/fedora-21
hypervisor: vagrant
CONFIG:
type: foss

0 comments on commit c6f5f18

Please sign in to comment.