Modulefile

@@ -1,5 +1,5 @@
 name    'ghoneycutt-pam'
-version '2.11.0'
+version '2.12.0'
 source 'git://github.com/ghoneycutt/puppet-module-pam.git'
 author 'ghoneycutt'
 license 'Apache-2.0'

README.md

@@ -24,6 +24,8 @@ This module has been tested to work on the following systems using Puppet v3 wit
  * Suse 12
  * Ubuntu 12.04 LTS
 
+EL no longer requires the `redhat-lsb` package.
+
 ===
 
 # Parameters

manifests/init.pp

@@ -47,7 +47,7 @@
 
   case $::osfamily {
     'RedHat': {
-      case $::lsbmajdistrelease {
+      case $::operatingsystemmajrelease {
         '5': {
           $default_pam_d_login_template = 'pam/login.el5.erb'
           $default_pam_d_sshd_template  = 'pam/sshd.el5.erb'
@@ -300,7 +300,7 @@
           }
         }
         default: {
-          fail("Pam is only supported on EL 5, 6 and 7. Your lsbmajdistrelease is identified as <${::lsbmajdistrelease}>.")
+          fail("Pam is only supported on EL 5, 6 and 7. Your operatingsystemmajrelease is identified as <${::operatingsystemmajrelease}>.")
         }
       }
     }

metadata.json

@@ -1,6 +1,6 @@
 {
   "name": "ghoneycutt-pam",
-  "version": "2.11.0",
+  "version": "2.12.0",
   "author": "ghoneycutt",
   "summary": "Manage PAM",
   "license": "Apache-2.0",

spec/classes/accesslogin_spec.rb

@@ -4,8 +4,8 @@
     context 'with default values on supported platform' do
       let(:facts) do
         {
-          :osfamily          => 'RedHat',
-          :lsbmajdistrelease => '5',
+          :osfamily                   => 'RedHat',
+          :operatingsystemmajrelease  => '5',
         }
       end
 
@@ -40,8 +40,8 @@
     context 'with multiple users on supported platform expressed as an array' do
       let(:facts) do
         {
-          :osfamily          => 'RedHat',
-          :lsbmajdistrelease => '5',
+          :osfamily                   => 'RedHat',
+          :operatingsystemmajrelease  => '5',
         }
       end
       let(:pre_condition) do
@@ -80,8 +80,8 @@
     context 'with hash entry containing string values' do
       let(:facts) do
         {
-          :osfamily          => 'RedHat',
-          :lsbmajdistrelease => '5',
+          :osfamily                   => 'RedHat',
+          :operatingsystemmajrelease  => '5',
         }
       end
       let(:pre_condition) do
@@ -94,8 +94,8 @@
     context 'with hash entry containing array of values' do
       let(:facts) do
         {
-          :osfamily          => 'RedHat',
-          :lsbmajdistrelease => '5',
+          :osfamily                   => 'RedHat',
+          :operatingsystemmajrelease  => '5',
         }
       end
       let(:pre_condition) do
@@ -107,8 +107,8 @@
     context 'with hash entry containing no value should default to "ALL"' do
       let(:facts) do
         {
-          :osfamily          => 'RedHat',
-          :lsbmajdistrelease => '5',
+          :osfamily                   => 'RedHat',
+          :operatingsystemmajrelease  => '5',
         }
       end
       let(:pre_condition) do
@@ -120,8 +120,8 @@
     context 'with hash entries containing string, array and empty hash' do
       let(:facts) do
         {
-          :osfamily          => 'RedHat',
-          :lsbmajdistrelease => '5',
+          :osfamily                   => 'RedHat',
+          :operatingsystemmajrelease  => '5',
         }
       end
       let(:pre_condition) do
@@ -137,8 +137,8 @@
     context 'with custom values on supported platform' do
       let(:facts) do
         {
-          :osfamily          => 'RedHat',
-          :lsbmajdistrelease => '5',
+          :osfamily                   => 'RedHat',
+          :operatingsystemmajrelease  => '5',
         }
       end