Merge pull request jhoblitt#8 from jhoblitt/feature/v1.2.0

Feature/v1.2.0
efoft · Sep 2, 2014 · a7a628a · a7a628a
2 parents edf951c + 88b1b24
commit a7a628a
Show file tree

Hide file tree

Showing 11 changed files with 145 additions and 90 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,11 @@
-pkg/
-spec/fixtures/
+.bundle
 Gemfile.lock
 *.orig
-*.rej
 *.patch
+pkg/
+*.rej
+.rspec_system/
+spec/fixtures/manifests/
+spec/fixtures/modules/
+*.swp
+.vagrant
diff --git a/.travis.yml b/.travis.yml
@@ -3,30 +3,22 @@ rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
-  - ruby-head
 env:
-  - PUPPET_GEM_VERSION="~> 2.7.0"
-  - PUPPET_GEM_VERSION="~> 3.0.0"
-  - PUPPET_GEM_VERSION="~> 3.1.0"
-  - PUPPET_GEM_VERSION="~> 3.2.1"
-  - PUPPET_GEM_VERSION="~> 3.3.0"
+  - PUPPET_GEM_VERSION="2.7.14"
+  - PUPPET_GEM_VERSION="~> 2.7"
+  - PUPPET_GEM_VERSION="~> 3.3"
 matrix:
   allow_failures:
     - rvm: ruby-head
   exclude:
     - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
+      env: PUPPET_GEM_VERSION="2.7.14"
     - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.0.0"
+      env: PUPPET_GEM_VERSION="2.7.14"
+    - rvm: 1.9.3
+      env: PUPPET_GEM_VERSION="~> 2.7"
     - rvm: 2.0.0
-      env: PUPPET_GEM_VERSION="~> 3.1.0"
-    - rvm: ruby-head
-      env: PUPPET_GEM_VERSION="~> 2.7.0"
-    - rvm: ruby-head
-      env: PUPPET_GEM_VERSION="~> 3.0.0"
-    - rvm: ruby-head
-      env: PUPPET_GEM_VERSION="~> 3.1.0"
+      env: PUPPET_GEM_VERSION="~> 2.7"
+  fast_finish: true
 notifications:
   email: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1,67 @@
+
+#### [Current]
+ * [5b5770f](../../commit/5b5770f) - __(Joshua Hoblitt)__ fix linter warnings
+ * [0d2f8ef](../../commit/0d2f8ef) - __(Joshua Hoblitt)__ update README format
+ * [a2f9824](../../commit/a2f9824) - __(Joshua Hoblitt)__ update puppet versions in travis matrix
+ * [3c283b1](../../commit/3c283b1) - __(Joshua Hoblitt)__ add el7.x to README platforms list
+ * [d7b6c5f](../../commit/d7b6c5f) - __(Joshua Hoblitt)__ add `:require` option to all Gemfile entries
+ * [af79b53](../../commit/af79b53) - __(Joshua Hoblitt)__ update .gitignore
+ * [9bd46bd](../../commit/9bd46bd) - __(Joshua Hoblitt)__ update copyright notice year to 2014
+ * [edf951c](../../commit/edf951c) - __(Joshua Hoblitt)__ Merge pull request [#7](../../issues/7) from razorsedge/support_el7
+
+Added support for EL7.
+ * [3fe4023](../../commit/3fe4023) - __(Michael Arnold)__ Make the spec tests pass.
+
+Commented out all the "should include_class" stanzas.  This should make
+Travis-CI happy.
+
+ * [d6f934f](../../commit/d6f934f) - __(Michael Arnold)__ Added support for EL7.
+ * [2dae883](../../commit/2dae883) - __(Joshua Hoblitt)__ fix README ToC
+
+#### v1.1.1
+ * [26e1430](../../commit/26e1430) - __(Joshua Hoblitt)__ bump version to v1.1.1
+ * [de20f48](../../commit/de20f48) - __(Joshua Hoblitt)__ update README param docs
+ * [4e07c04](../../commit/4e07c04) - __(Joshua Hoblitt)__ reduce stdlib requirement to 3.0.0
+ * [0a3be5b](../../commit/0a3be5b) - __(Joshua Hoblitt)__ add puppet 3.3.0 to travis test matrix
+ * [c2a54cb](../../commit/c2a54cb) - __(Joshua Hoblitt)__ add GFMD highlighting to README
+ * [aafd0c8](../../commit/aafd0c8) - __(Joshua Hoblitt)__ fix README markdown typo
+
+#### v1.1.0
+ * [b83bdd7](../../commit/b83bdd7) - __(Joshua Hoblitt)__ bump version to v1.1.0
+ * [8f04955](../../commit/8f04955) - __(Joshua Hoblitt)__ Merge pull request [#5](../../issues/5) from jhoblitt/service_control
+
+split ipmi::service class into ipmi::service::{ipmi,ipmievd)
+ * [47cc455](../../commit/47cc455) - __(Joshua Hoblitt)__ split ipmi::service class into ipmi::service::{ipmi,ipmievd)
+ * [7f1d5c3](../../commit/7f1d5c3) - __(Joshua Hoblitt)__ puppet-lint should ignore pkg/**
+
+#### v1.0.1
+ * [2821421](../../commit/2821421) - __(Joshua Hoblitt)__ bump version to v1.0.1
+ * [4f19e76](../../commit/4f19e76) - __(Joshua Hoblitt)__ Merge pull request [#4](../../issues/4) from jhoblitt/remove_lsb_facts
+
+remove usage of $::lsbmajdistrelease fact
+ * [23c2227](../../commit/23c2227) - __(Joshua Hoblitt)__ remove usage of $::lsbmajdistrelease fact
+
+Instead use $::operatingsystemmajrelease as this fact is not dependant on
+redhat-lsb being present on the system.
+
+ * [95c5d0f](../../commit/95c5d0f) - __(Joshua Hoblitt)__ fix ugly typo in ipmi::service tests
+ * [f76e51f](../../commit/f76e51f) - __(Joshua Hoblitt)__ validate `$start_ipmievd` param to classes `ipmi` & `ipmi::service`
+ * [2b6de1a](../../commit/2b6de1a) - __(Joshua Hoblitt)__ Merge pull request [#2](../../issues/2) from razorsedge/ipmievd
+
+Support for ipmievd.
+ * [a3922d2](../../commit/a3922d2) - __(Michael Arnold)__ Advanced configuration of ipmievd service.
+ * [a99cf85](../../commit/a99cf85) - __(Michael Arnold)__ Basic addition of ipmievd service.
+
+#### v1.0.0
+ * [efc47e5](../../commit/efc47e5) - __(Joshua Hoblitt)__ refactor module structure
+
+* split ipmi::install into ipmi::{install,params}
+* base class inherits ipmi::params
+* contain subclasses in ipmi base class
+* comprehensive test coverage
+
+ * [7534ba8](../../commit/7534ba8) - __(Joshua Hoblitt)__ fix README ToC formatting
+ * [9defe3b](../../commit/9defe3b) - __(Joshua Hoblitt)__ update README formatting
+ * [8128871](../../commit/8128871) - __(Joshua Hoblitt)__ fix linter warnings
+ * [3acd51d](../../commit/3acd51d) - __(Joshua Hoblitt)__ Merge puppet-module_skel
+ * [fd0a998](../../commit/fd0a998) - __(Joshua Hoblitt)__ first commit
diff --git a/Gemfile b/Gemfile
@@ -6,9 +6,7 @@ else
   gem 'puppet', :require => false
 end
 
-gem 'rake'
-gem 'puppetlabs_spec_helper'
-gem 'puppet-lint'
-gem 'puppet-syntax'
-
-# vim:ft=ruby
+gem 'rake',                   :require => false
+gem 'puppetlabs_spec_helper', :require => false
+gem 'puppet-lint',            :require => false
+gem 'puppet-syntax',          :require => false
diff --git a/LICENSE b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (C) 2012-2013 Joshua Hoblitt <jhoblitt@cpan.org>
+Copyright (C) 2012-2014 Joshua Hoblitt <jhoblitt@cpan.org>
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

diff --git a/Modulefile b/Modulefile
@@ -1,5 +1,5 @@
 name    'jhoblitt-ipmi'
-version '1.1.1'
+version '1.2.0'
 
 author 'Joshua Hoblitt <jhoblitt@cpan.org>'
 license 'Apache'

diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 Puppet ipmi Module
-=========================
+==================
 
 [![Build Status](https://travis-ci.org/jhoblitt/puppet-ipmi.png)](https://travis-ci.org/jhoblitt/puppet-ipmi)
 
@@ -9,9 +9,13 @@ Puppet ipmi Module
 1. [Overview](#overview)
 2. [Description](#description)
 3. [Usage](#usage)
+    * [Example](#example)
+    * [Classes](#classes)
 4. [Limitations](#limitations)
     * [Tested Platforms](#tested-platforms)
-5. [Support](#support)
+5. [Versioning](#versioning)
+6. [Support](#support)
+7. [See Also](#see-also)
 
 
 Overview
@@ -31,36 +35,39 @@ with the BMC from user space.
 Usage
 -----
 
-### Basic
+### Example
 
 ```puppet
     include ipmi
 ```
 
-### Parameters
+### Classes
 
-* `service_ensure`
+#### `ipmi`
 
-String.  Possible values: 'running', 'stopped'
+```puppet
+# defaults
+class { 'ipmi':
+  service_ensure         => 'running', # default is 'running'
+  ipmievd_service_ensure => 'running', # default is 'stopped'
+}
+```
 
-Controls the state of the `ipmi` service.
+##### `service_ensure`
 
-Default: 'running'
+`String` defaults to: `running`
 
-* `ipmievd_service_ensure`
+Possible values: `running`, `stopped`
 
-String.  Possible values: 'running', 'stopped'
+Controls the state of the `ipmi` service.
 
-Controls the state of the `ipmievd` service.
+##### `ipmievd_service_ensure`
 
-Default: 'stopped'
+`String` defaults to: `stopped`
 
-```puppet
-    class { 'ipmi':
-      service_ensure         => 'running', # default is 'running'
-      ipmievd_service_ensure => 'running', # default is 'stopped'
-    }
-```
+ Possible values: `running', `stopped`
+
+Controls the state of the `ipmievd` service.
 
 
 Limitations
@@ -73,6 +80,14 @@ Adding other Linux distrubtions should be trivial.
 
 * el5.x
 * el6.x
+* el7.x
+
+
+Versioning
+----------
+
+This module is versioned according to the [Semantic Versioning
+2.0.0](http://semver.org/spec/v2.0.0.html) specification.
 
 
 Support
@@ -82,3 +97,7 @@ Please log tickets and issues at
 [github](https://github.com/jhoblitt/puppet-ipmi/issues)
 
 
+See Also
+--------
+
+* [OpenIPMI](http://openipmi.sourceforge.net/)
diff --git a/manifests/init.pp b/manifests/init.pp
@@ -1,33 +1,7 @@
 # == Class: ipmi
 #
-#
-# === Parameters
-#
-# [*service_ensure*]
-#
-# String.  Possible values: 'running', 'stopped'
-#
-# Controls the state of the `ipmi` service.
-#
-# Default: 'running'
-#
-# [*ipmievd_service_ensure*]
-#
-# String.  Possible values: 'running', 'stopped'
-#
-# Controls the state of the `ipmievd` service.
-#
-# Default: 'stopped'
-#
-# === Examples
-#
-#
-# include ipmi
-#
-# class { 'ipmi':
-#   service_ensure         => 'running',
-#   ipmievd_service_ensure => 'running',
-# }
+# Please refer to https://github.com/jhoblitt/puppet-ipmi#usage for
+# parameter documentation.
 #
 # === Authors
 #

diff --git a/manifests/service.pp b/manifests/service.pp
@@ -32,16 +32,16 @@
   }
 
   service{ 'ipmi':
-    ensure      => running,
-    hasstatus   => true,
-    hasrestart  => true,
-    enable      => true,
+    ensure     => running,
+    hasstatus  => true,
+    hasrestart => true,
+    enable     => true,
   }
 
   service{ 'ipmievd':
-    ensure      => $ipmievd_ensure,
-    hasrestart  => true,
-    hasstatus   => true,
-    enable      => $ipmievd_enable,
+    ensure     => $ipmievd_ensure,
+    hasrestart => true,
+    hasstatus  => true,
+    enable     => $ipmievd_enable,
   }
 }
diff --git a/manifests/service/ipmi.pp b/manifests/service/ipmi.pp
@@ -20,10 +20,10 @@
   validate_bool($enable)
 
   service{ 'ipmi':
-    ensure      => $ensure,
-    hasstatus   => true,
-    hasrestart  => true,
-    enable      => $enable,
+    ensure     => $ensure,
+    hasstatus  => true,
+    hasrestart => true,
+    enable     => $enable,
   }
 
 }
diff --git a/manifests/service/ipmievd.pp b/manifests/service/ipmievd.pp
@@ -20,10 +20,10 @@
   validate_bool($enable)
 
   service{ 'ipmievd':
-    ensure      => $ensure,
-    hasstatus   => true,
-    hasrestart  => true,
-    enable      => $enable,
+    ensure     => $ensure,
+    hasstatus  => true,
+    hasrestart => true,
+    enable     => $enable,
   }
 
 }