(SIMP-918) Use SSSD for EL6.7+

* Updated to use SSSD as the default for EL6.7+ since it should be fixed
going forward.
* Validated against Puppet 4.3.2
* Updated travis.yml
* Updated fixtures.yml
* Updated all tests to use the facts gem
* Added spec_parallel since these take *forever* to run otherwise
* Corrected metadata.json

SIMP-918 #close

Change-Id: Ia242f6086ea16604222a4b1c30106cd7f5abc758

Author: trevor-vaughan

.fixtures.yml

@@ -6,30 +6,64 @@ fixtures:
     aide: "git://github.com/simp/pupmod-simp-aide"
     apache: "git://github.com/simp/pupmod-simp-apache"
     auditd: "git://github.com/simp/pupmod-simp-auditd"
-    augeasproviders:             "git://github.com/simp/augeasproviders"
-    augeasproviders_base:        "git://github.com/simp/augeasproviders_base"
-    augeasproviders_core:        "git://github.com/simp/augeasproviders_core"
-    augeasproviders_grub:        "git://github.com/simp/augeasproviders_grub"
-    augeasproviders_puppet:      "git://github.com/simp/augeasproviders_puppet"
-    augeasproviders_apache:      "git://github.com/simp/augeasproviders_apache"
-    augeasproviders_mounttab:    "git://github.com/simp/augeasproviders_mounttab"
-    augeasproviders_nagios:      "git://github.com/simp/augeasproviders_nagios"
-    augeasproviders_pam:         "git://github.com/simp/augeasproviders_pam"
-    augeasproviders_postgresql:  "git://github.com/simp/augeasproviders_postgresql"
-    augeasproviders_shellvar:    "git://github.com/simp/augeasproviders_shellvar"
-    augeasproviders_ssh:         "git://github.com/simp/augeasproviders_ssh"
-    augeasproviders_sysctl:      "git://github.com/simp/augeasproviders_sysctl"
+    augeasproviders:
+      repo: "git://github.com/simp/augeasproviders"
+      branch: "simp-master"
+    augeasproviders_base:
+      repo: "git://github.com/simp/augeasproviders_base"
+      branch: "simp-master"
+    augeasproviders_core:
+      repo: "git://github.com/simp/augeasproviders_core"
+      branch: "simp-master"
+    augeasproviders_grub:
+      repo: "git://github.com/simp/augeasproviders_grub"
+      branch: "simp-master"
+    augeasproviders_puppet:
+      repo: "git://github.com/simp/augeasproviders_puppet"
+      branch: "simp-master"
+    augeasproviders_apache:
+      repo: "git://github.com/simp/augeasproviders_apache"
+      branch: "simp-master"
+    augeasproviders_mounttab:
+      repo: "git://github.com/simp/augeasproviders_mounttab"
+      branch: "simp-master"
+    augeasproviders_nagios:
+      repo: "git://github.com/simp/augeasproviders_nagios"
+      branch: "simp-master"
+    augeasproviders_pam:
+      repo: "git://github.com/simp/augeasproviders_pam"
+      branch: "simp-master"
+    augeasproviders_postgresql:
+      repo: "git://github.com/simp/augeasproviders_postgresql"
+      branch: "simp-master"
+    augeasproviders_shellvar:
+      repo: "git://github.com/simp/augeasproviders_shellvar"
+      branch: "simp-master"
+    augeasproviders_ssh:
+      repo: "git://github.com/simp/augeasproviders_ssh"
+      branch: "simp-master"
+    augeasproviders_sysctl:
+      repo: "git://github.com/simp/augeasproviders_sysctl"
+      branch: "simp-master"
     autofs: "git://github.com/simp/pupmod-simp-autofs"
     clamav: "git://github.com/simp/pupmod-simp-clamav"
-    datacat: "git://github.com/simp/puppet-datacat"
+    datacat:
+      repo: "git://github.com/simp/puppet-datacat"
+      branch: "simp-master"
     compliance: "https://github.com/trevor-vaughan/pupmod-compliance"
     dhcp: "git://github.com/simp/pupmod-simp-dhcp"
     freeradius: "git://github.com/simp/pupmod-simp-freeradius"
     ganglia: "git://github.com/simp/pupmod-simp-ganglia"
-    inifile: "git://github.com/simp/puppetlabs-inifile"
+    inifile:
+      repo: "git://github.com/simp/puppetlabs-inifile"
+      branch: "simp-master"
     iptables: "git://github.com/simp/pupmod-simp-iptables"
-    java: "git://github.com/simp/puppetlabs-java"
-    java_ks: "git://github.com/simp/puppetlabs-java_ks"
+    java:
+      repo: "git://github.com/simp/puppetlabs-java"
+      branch: "simp-master"
+    java_ks:
+      repo: "git://github.com/simp/puppetlabs-java_ks"
+      branch: "simp-master"
     logrotate: "git://github.com/simp/pupmod-simp-logrotate"
     mcollective: "git://github.com/simp/pupmod-simp-mcollective"
     named: "git://github.com/simp/pupmod-simp-named"
@@ -41,6 +75,9 @@ fixtures:
     pam: "git://github.com/simp/pupmod-simp-pam"
     pki: "git://github.com/simp/pupmod-simp-pki"
     postfix: "git://github.com/simp/pupmod-simp-postfix"
+    puppetdb:
+      repo: "git://github.com/simp/puppetlabs-puppetdb"
+      branch: "simp-master"
     pupmod: "git://github.com/simp/pupmod-simp-pupmod"
     rsync: "git://github.com/simp/pupmod-simp-rsync"
     rsyslog: "git://github.com/simp/pupmod-simp-rsyslog"
@@ -49,7 +86,9 @@ fixtures:
     simplib: "git://github.com/simp/pupmod-simp-simplib"
     snmpd: "git://github.com/simp/pupmod-simp-snmpd"
     ssh: "git://github.com/simp/pupmod-simp-ssh"
-    stdlib: "git://github.com/simp/puppetlabs-stdlib"
+    stdlib:
+      repo: "git://github.com/simp/puppetlabs-stdlib"
+      branch: "simp-master"
     stunnel: "git://github.com/simp/pupmod-simp-stunnel"
     sssd: "git://github.com/simp/pupmod-simp-sssd"
     sudo: "git://github.com/simp/pupmod-simp-sudo"

.fixtures.yml.local

@@ -29,6 +29,7 @@ fixtures:
     pam: "#{source_dir}/../pam"
     pki: "#{source_dir}/../pki"
     postfix: "#{source_dir}/../postfix"
+    puppetdb: "#{source_dir}/../puppetdb"
     pupmod: "#{source_dir}/../pupmod"
     rsync: "#{source_dir}/../rsync"
     rsyslog: "#{source_dir}/../rsyslog"

.gitignore

@@ -3,6 +3,7 @@
 dist
 /pkg
 /spec/fixtures
+/spec/rp_env
 !/spec/hieradata/default.yaml
 !/spec/fixtures/site.pp
 /.rspec_system

.puppet-lint.rc

@@ -2,3 +2,4 @@
 --relative
 --no-class_inherits_from_params_class-check
 --no-80chars-check
+--no-inherits_across_namespaces-check

.travis.yml

@@ -31,60 +31,33 @@ env:
     - PUPPET_VERSION="~> 4.0.0"
     - PUPPET_VERSION="~> 4.1.0"
     - PUPPET_VERSION="~> 4.2.0"
+    - PUPPET_VERSION="~> 4.3.0"
 matrix:
   fast_finish: true
   allow_failures:
     - rvm: 1.8.7
-    - rvm: 2.1.0
     - rvm: 2.2.1
     - env: PUPPET_VERSION="~> 3.5.0"
     - env: PUPPET_VERSION="~> 3.6.0"
     - env: PUPPET_VERSION="~> 3.7.0" FUTURE_PARSER=yes
     - env: PUPPET_VERSION="~> 3.8.0" FUTURE_PARSER=yes
-    - env: PUPPET_VERSION="~> 4.0.0"
-    - env: PUPPET_VERSION="~> 4.1.0"
-    - env: PUPPET_VERSION="~> 4.2.0"
 
   exclude:
   # Ruby 1.8.7
   # - Ruby 1.8.7 & Puppet 4.X is impossibru
   - rvm: 1.8.7
-    env: PUPPET_VERSION="~> 4.0.0"
-  - rvm: 1.8.7
-    env: PUPPET_VERSION="~> 4.1.0"
-  - rvm: 1.8.7
-    env: PUPPET_VERSION="~> 4.2.0"
+    env: PUPPET_VERSION="~> 4.0"
 
   # - simp-rake-helpers deps currently break between 1.8.7 and 3.X
   # - Currently there is Gemfile logic testing for TRAVIS to avoid this.
   # - For Ruby 1.8.7, testing earliest and latest 3.X is sufficient.
   - rvm: 1.8.7
-    env: PUPPET_VERSION="~> 3.5.0"
-  - rvm: 1.8.7
-    env: PUPPET_VERSION="~> 3.6.0"
-  - rvm: 1.8.7
-    env: PUPPET_VERSION="~> 3.7.0" FUTURE_PARSER=yes
-  - rvm: 1.8.7
-    env: PUPPET_VERSION="~> 3.8.0" FUTURE_PARSER=yes
+    env: PUPPET_VERSION="~> 3.0"
 
   # Ruby 2.1.0
   - rvm: 2.1.0
-    env: PUPPET_VERSION="~> 3.5.0"
-  - rvm: 2.1.0
-    env: PUPPET_VERSION="~> 3.6.0"
-  - rvm: 2.1.0
-    env: PUPPET_VERSION="~> 3.7.0"
+    env: PUPPET_VERSION="< 3.8"
 
   # Ruby 2.2.1
   - rvm: 2.2.1
-    env: PUPPET_VERSION="~> 3.5.0"
-  - rvm: 2.2.1
-    env: PUPPET_VERSION="~> 3.6.0"
-  - rvm: 2.2.1
-    env: PUPPET_VERSION="~> 3.7.0"
-  - rvm: 2.2.1
-    env: PUPPET_VERSION="~> 3.7.0" FUTURE_PARSER=yes
-  - rvm: 2.2.1
-    env: PUPPET_VERSION="~> 3.8.0"
-  - rvm: 2.2.1
-    env: PUPPET_VERSION="~> 3.8.0" FUTURE_PARSER=yes
+    env: PUPPET_VERSION="~> 3.0"

Gemfile

@@ -8,16 +8,7 @@ gem_sources   = ENV.key?('SIMP_GEM_SERVERS') ? ENV['SIMP_GEM_SERVERS'].split(/[,
 gem_sources.each { |gem_source| source gem_source }
 
 group :test do
-  gem "rake"
   gem 'puppet', puppetversion
-  gem "rspec", '< 3.2.0'
-  gem "rspec-puppet"
-  gem "puppetlabs_spec_helper"
-  gem "metadata-json-lint"
-  gem "simp-rspec-puppet-facts"
-
-  # dependency hacks:
-  gem "fog-google", '~> 0.0.9' # 0.1 dropped support for ruby 1.9
 
   # simp-rake-helpers does not suport puppet 2.7.X
   if "#{ENV['PUPPET_VERSION']}".scan(/\d+/).first != '2' &&
@@ -27,26 +18,3 @@ group :test do
     gem 'simp-rake-helpers'
   end
 end
-
-group :development do
-  gem "travis"
-  gem "travis-lint"
-  gem "vagrant-wrapper"
-  gem "puppet-blacksmith"
-  gem "guard-rake"
-  gem 'pry'
-  gem 'pry-doc'
-end
-
-group :system_tests do
-  gem 'beaker'
-  gem 'beaker-rspec'
-
-  # 1.0.5 introduces FIPS-first acc tests
-  gem 'simp-beaker-helpers', '>= 1.0.11'
-
-  # dependency hacks:
-  # NOTE: Workaround because net-ssh 2.10 is busting beaker
-  # lib/ruby/1.9.1/socket.rb:251:in `tcp': wrong number of arguments (5 for 4) (ArgumentError)
-  gem 'net-ssh', '~> 2.9.0'
-end

Rakefile

@@ -1,68 +1,3 @@
-require 'puppetlabs_spec_helper/rake_tasks'
-require 'puppet/version'
-require 'puppet/vendor/semantic/lib/semantic' unless Puppet.version.to_f < 3.6
-require 'puppet-syntax/tasks/puppet-syntax'
-require 'puppet-lint/tasks/puppet-lint'
+require 'simp/rake/pupmod/helpers'
 
-# These gems aren't always present, for instance
-# on Travis with --without development
-begin
-  require 'puppet_blacksmith/rake_tasks'
-rescue LoadError
-end
-
-
-# Lint & Syntax exclusions
-exclude_paths = [
-  "bundle/**/*",
-  "pkg/**/*",
-  "dist/**/*",
-  "vendor/**/*",
-  "spec/**/*",
-]
-PuppetSyntax.exclude_paths = exclude_paths
-
-# See: https://github.com/rodjek/puppet-lint/pull/397
-Rake::Task[:lint].clear
-PuppetLint.configuration.ignore_paths = exclude_paths
-PuppetLint::RakeTask.new :lint do |config|
-  config.ignore_paths = PuppetLint.configuration.ignore_paths
-end
-
-begin
-  require 'simp/rake/pkg'
-  Simp::Rake::Pkg.new( File.dirname( __FILE__ ) ) do | t |
-    t.clean_list << "#{t.base_dir}/spec/fixtures/hieradata/hiera.yaml"
-  end
-rescue LoadError
-  puts "== WARNING: Gem simp-rake-helpers not found, pkg: tasks cannot be run! =="
-end
-
-begin
-  require 'simp/rake/beaker'
-  Simp::Rake::Beaker.new( File.dirname( __FILE__ ) )
-rescue LoadError
-  # Ignoring this for now since all of these are currently convenience methods.
-end
-
-desc "Run acceptance tests"
-RSpec::Core::RakeTask.new(:acceptance) do |t|
-  t.pattern = 'spec/acceptance'
-end
-
-desc "Populate CONTRIBUTORS file"
-task :contributors do
-  system("git log --format='%aN' | sort -u > CONTRIBUTORS")
-end
-
-task :metadata do
-  sh "metadata-json-lint metadata.json"
-end
-
-desc "Run syntax, lint, and spec tests."
-task :test => [
-  :syntax,
-  :lint,
-  :spec,
-  :metadata,
-]
+Simp::Rake::Pupmod::Helpers.new(File.dirname(__FILE__))

build/pupmod-simp.spec

@@ -1,16 +1,19 @@
 Summary: SIMP Puppet Module
 Name: pupmod-simp
-Version: 1.1.0
-Release: 9
+Version: 1.2.0
+Release: 0
 License: Apache License, Version 2.0
 Group: Applications/System
 Source: %{name}-%{version}-%{release}.tar.gz
 Requires: pupmod-aide >= 4.1.0-2
 Requires: pupmod-apache >= 4.1.0-4
 Requires: pupmod-auditd >= 4.1.0-3
 Requires: pupmod-augeasproviders_puppet
+Requires: pupmod-autofs >= 4.1.1-0
 Requires: pupmod-clamav >= 4.1.0-2
 Requires: pupmod-dhcp >= 4.1.0-0
+Requires: pupmod-freeradius >= 5.0.0-0
+Requires: pupmod-ganglia >= 5.0.0-0
 Requires: pupmod-iptables >= 4.1.0-3
 Requires: pupmod-logrotate >= 4.1.0-0
 Requires: pupmod-named >= 4.2.0-0
@@ -26,7 +29,7 @@ Requires: pupmod-rsync >= 4.1.0-1
 Requires: pupmod-rsyslog >= 5.0.0-0
 Requires: pupmod-selinux >= 1.0.0-1
 Requires: pupmod-simpcat
-Requires: pupmod-simplib
+Requires: pupmod-simplib >= 1.1.0-0
 Requires: pupmod-ssh >= 4.1.0-2
 Requires: pupmod-stunnel >= 4.2.0-0
 Requires: pupmod-sudo >= 4.1.0-0
@@ -40,7 +43,6 @@ Requires: pupmod-xinetd >= 2.1.0-0
 Requires: puppetlabs-stdlib >= 4.1.0-1.SIMP
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 Buildarch: noarch
-Requires: simp-bootstrap >= 4.2.0
 Obsoletes: pupmod-simp-test >= 0.0.1
 
 Prefix: %{_sysconfdir}/puppet/environments/simp/modules
@@ -85,6 +87,12 @@ fi
 # Post uninstall stuff
 
 %changelog
+* Mon Mar 14 2016 Trevor Vaughan <[email protected]> - 1.2.0-0
+- Moved to Semantic Versioning 2.0
+- Ensure that SSSD is used for systems EL6.7+
+- Removed RPM dependency on simp-bootstrap as it is not technically required.
+- Test against Puppet 4.3.2
+
 * Tue Mar 08 2016 Nick Markowski <[email protected]> - 1.1.0-9
 - Updated a bad default for nfs_server in the home_client class, which
   otherwise had the potential to render a nil server value, and

manifests/freeradius/stock_ldap.pp

@@ -18,6 +18,6 @@
 # * Trevor Vaughan <[email protected]>
 #
 class simp::freeradius::stock_ldap {
-  include 'freeradius::stock'
-  include 'freeradius::modules::ldap'
+  include '::simp::freeradius::stock'
+  include '::freeradius::modules::ldap'
 }

manifests/params.pp

@@ -11,7 +11,7 @@
 #   issues which significantly weaken your security posture.
 class simp::params {
   if $::operatingsystem in ['RedHat','CentOS'] {
-    if versioncmp($::operatingsystemmajrelease,'7') < 0 {
+    if (versioncmp($::operatingsystemmajrelease,'6.7') < 0) {
       $_use_sssd = false
       $_use_nscd = true
     }