Merge pull request #3 from voxpupuli/migration_prep

Migration prep
voxpupuli · Jan 6, 2017 · e2452fe · e2452fe
2 parents 9b78884 + 050f348
commit e2452fe
Show file tree

Hide file tree

Showing 10 changed files with 78 additions and 35 deletions.
diff --git a/.sync.yml b/.sync.yml
@@ -1,5 +1,26 @@
 ---
 .travis.yml:
+  extras:
+  - rvm: 2.3.1
+    env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/centos-7
+    services: docker
+    sudo: required
+    bundler_args: --without development
+  - rvm: 2.3.1
+    env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/debian-8
+    services: docker
+    sudo: required
+    bundler_args: --without development
+  - rvm: 2.3.1
+    env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
+    services: docker
+    sudo: required
+    bundler_args: --without development
+  - rvm: 2.3.1
+    env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/ubuntu-16.04
+    services: docker
+    sudo: required
+    bundler_args: --without development
   secure: "MZqQwYbb+SzRq+9NhBRILmNxA0dFPoQ9Q4ueidPUP7V4VGgm1HGG59K1ajdAnxayWvTmrLhtpNWw11HBLeSC6GVdkAdxd5NMpJSlqr7GRDfezx14Mi4sF+4NnAB39Kb0jyaA/jLnY/JBuk7FMAvicdrC5nvwMXz0yy2SxohLILf3i8FIL4dfpBLUcp+bnyXB/v2q59h/z1zsCng1s4Mz1zsW+jSKGY3to5gOiD6HBvZbveY3t0emon0pwQA9sP3FUDtgCmXsmfYfuKzWL1p3jNAC7ago22Y/UMKmOEg4dCTAjHpnzeE+RtUVjDVYKVZYdUDJiA/8aQbGTfsljfnHhqnrWUlb32pU4FM0qRARZiSzRkr7F43NZf4kPE9gpD6VuOqXWYPjQNim/pU3SGBDiEI1YcrAWloJxbpPbfk5QEoJ+uFUVAHmdV+a9Mb+8s7fXn1jO7qF4qn2M2ruxr3rWj0DZmVahQCtZ6y3/FXUNj3nLzTlqzwgnW9iwOguWlp343vDVTOy1CRjC4QX6PRhRbeC8qOlfQQsVZQ49DCOiqJKyhKJ5vsAWBXqxybQgAcUM8vnovqFrz2rhrg/SJqdZqtX9t03R7MvYRiFQ41sGFgCP9cOSyVeE82sawu1jj55gSPvpgaM2Lqrla78mirJsWcznWwU0hhct408VLoEtPk="
 Gemfile:
   optional:

diff --git a/.travis.yml b/.travis.yml
@@ -28,6 +28,26 @@ matrix:
     env: PUPPET_VERSION="~> 4.0" CHECK=test
   - rvm: 2.4.0
     env: PUPPET_VERSION="~> 4.0" CHECK=test
+  - rvm: 2.3.1
+    env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/centos-7
+    services: docker
+    sudo: required
+    bundler_args: --without development
+  - rvm: 2.3.1
+    env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/debian-8
+    services: docker
+    sudo: required
+    bundler_args: --without development
+  - rvm: 2.3.1
+    env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
+    services: docker
+    sudo: required
+    bundler_args: --without development
+  - rvm: 2.3.1
+    env: PUPPET_INSTALL_TYPE=agent CHECK=acceptance BEAKER_debug=true BEAKER_set=docker/ubuntu-16.04
+    services: docker
+    sudo: required
+    bundler_args: --without development
   allow_failures:
     - rvm: 2.4.0
 branches:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,15 @@
+## Release 2.0.1
+### Summary
+This release migrates the module from dhollinger to VoxPupuli under the Puppet
+namespace.
+
+#### Changes
+- Migrate to VoxPupuli
+- Update README badges
+- Update Puppet Strings urls
+- Cleanup code to pass Rubocop and Puppet-Lint checks
+- Improve the `autofs::mounts` tests
+
 ## Release 2.0.0
 ### Summary
 This release removes unused parameters and adds Puppet 4.x Data Types to the module's

diff --git a/README.md b/README.md
@@ -1,11 +1,11 @@
 Autofs Puppet Module
 ====================
 
-[![Travis branch](https://img.shields.io/travis/dhollinger/autofs-puppet/master.svg?style=flat-square)](https://travis-ci.org/dhollinger/autofs-puppet)
-[![Puppet Forge](https://img.shields.io/puppetforge/v/dhollinger/autofs.svg?style=flat-square)](https://forge.puppetlabs.com/dhollinger/autofs)
-[![Puppet Forge](https://img.shields.io/puppetforge/dt/dhollinger/autofs.svg?style=flat-square)](https://forge.puppet.com/dhollinger/autofs)
-[![Puppet Forge](https://img.shields.io/puppetforge/e/dhollinger/autofs.svg?style=flat-square)](https://forge.puppet.com/dhollinger/autofs)
-[![Puppet Forge](https://img.shields.io/puppetforge/f/dhollinger/autofs.svg?style=flat-square)](https://forge.puppet.com/dhollinger/autofs)
+[![Travis branch](https://img.shields.io/travis/voxpupuli/puppet-autofs/master.svg?style=flat-square)](https://travis-ci.org/voxpupuli/puppet-autofs)
+[![Puppet Forge](https://img.shields.io/puppetforge/v/puppet/autofs.svg?style=flat-square)](https://forge.puppetlabs.com/puppet/autofs)
+[![Puppet Forge](https://img.shields.io/puppetforge/dt/puppet/autofs.svg?style=flat-square)](https://forge.puppet.com/puppet/autofs)
+[![Puppet Forge](https://img.shields.io/puppetforge/e/puppet/autofs.svg?style=flat-square)](https://forge.puppet.com/puppet/autofs)
+[![Puppet Forge](https://img.shields.io/puppetforge/f/puppet/autofs.svg?style=flat-square)](https://forge.puppet.com/puppet/autofs)
 
 #### Table of Contents
 1. [Description - - What the module does and why it is useful](#description)
@@ -201,16 +201,12 @@ Limitations
 Release 2.0.0 (and above) only support Puppet 4.x and Puppet Enterprise 2015.2.0 or newer
 
 #### Puppet 3.x Compatibility
-Puppet 3.x was End of Life starting January 1st, 2017, if Puppet 3.x functionality is still needed, please install using one of the following methods:
-* Manually: `puppet module install dhollinger-autofs --version 1.4.5`
-* Puppetfile: `mod 'dhollinger-autofs', '1.4.5'`
-* Git: `git clone [email protected]:dhollinger/autofs-puppet.git -b 1.4.5 <module_path>/autofs`
+Puppet 3.x was End of Life starting January 1st, 2017, if Puppet 3.x functionality is still needed, please install using one of the following method:
+* `git clone [email protected]:voxpupuli/puppet-autofs.git -b puppet3 <module_path>/autofs`
 
 Support for Puppet 3.x Functionality:
-* No new features will be added to the 1.4.x/Puppet 3.x branches.
-* No new deployments will be issued Puppet Forge.
-* Will still accept Issues and Pull Requests until June 30, 2017.
-  * Tag issues with `legacy` tag.
+* No new features will be added to the puppet3 branch.
+* No new deployments will be issued to the Puppet Forge.
 
 #### Operating Systems
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -5,9 +5,9 @@
 # This class includes defined types for looping through arrays of configuration
 # file names.
 #
-# @see https://dhollinger.github.io/autofs-puppet Home
-# @see https://www.github.com/dhollinger/autofs-puppet Github
-# @see https://forge.puppet.com/dhollinger/autofs Puppet Forge
+# @see https://voxpupuli.org/puppet-autofs Home
+# @see https://www.github.com/voxpupuli/autofs-puppet Github
+# @see https://forge.puppet.com/puppet/autofs Puppet Forge
 #
 # @author David Hollinger III <[email protected]>
 #

diff --git a/manifests/mount.pp b/manifests/mount.pp
@@ -3,10 +3,10 @@
 # Defined type to generate autofs mount point
 # configuration files.
 #
-# @see https://dhollinger.github.io/autofs-puppet Home
-# @see https://dhollinger.github.io/autofs-puppet/puppet_classes/autofs.html puppet_classes::autofs
-# @see https://www.github.com/dhollinger/autofs-puppet Github
-# @see https://forge.puppet.com/dhollinger/autofs Puppet Forge
+# @see https://voxpupuli.org/puppet-autofs Home
+# @see https://voxpupuli.org/puppet-autofs/puppet_classes/autofs.html puppet_classes::autofs
+# @see https://www.github.com/voxpupuli/autofs-puppet Github
+# @see https://forge.puppet.com/puppet/autofs Puppet Forge
 #
 # @author David Hollinger III <[email protected]>
 #

diff --git a/manifests/mounts.pp b/manifests/mounts.pp
@@ -3,10 +3,10 @@
 # Class used specifically to pass hiera autolookups as a hiera_hash
 # to the autofs::mount defined type.
 #
-# @see https://dhollinger.github.io/autofs-puppet Home
+# @see https://voxpupuli.org/puppet-autofs Home
 # @see autofs
-# @see https://www.github.com/dhollinger/autofs-puppet Github
-# @see https://forge.puppet.com/dhollinger/autofs Puppet Forge
+# @see https://www.github.com/voxpupuli/autofs-puppet Github
+# @see https://forge.puppet.com/puppet/autofs Puppet Forge
 #
 # @author David Hollinger III <[email protected]>
 #

diff --git a/manifests/package.pp b/manifests/package.pp
@@ -2,10 +2,10 @@
 #
 # The autofs::package class installs the autofs package.
 #
-# @see https://dhollinger.github.io/autofs-puppet Home
+# @see https://voxpupuli.org/puppet-autofs Home
 # @see autofs
-# @see https://www.github.com/dhollinger/autofs-puppet Github
-# @see https://forge.puppet.com/dhollinger/autofs Puppet Forge
+# @see https://www.github.com/voxpupuli/autofs-puppet Github
+# @see https://forge.puppet.com/puppet/autofs Puppet Forge
 #
 # @author David Hollinger III <[email protected]>
 #

diff --git a/manifests/service.pp b/manifests/service.pp
@@ -5,10 +5,10 @@
 # if necessary. Such as allowing the service to run, but not at
 # startup.
 #
-# @see https://dhollinger.github.io/autofs-puppet Home
+# @see https://voxpupuli.org/puppet-autofs Home
 # @see autofs
-# @see https://www.github.com/dhollinger/autofs-puppet Github
-# @see https://forge.puppet.com/dhollinger/autofs Puppet Forge
+# @see https://www.github.com/voxpupuli/autofs-puppet Github
+# @see https://forge.puppet.com/puppet/autofs Puppet Forge
 #
 # @author David Hollinger III <[email protected]>
 #

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -1,17 +1,11 @@
 require 'beaker-rspec/spec_helper'
 require 'beaker-rspec/helpers/serverspec'
 require 'beaker/puppet_install_helper'
-require 'rspec/retry'
 
 RSpec.configure do |c|
   # Project root
   module_root = File.expand_path(File.join(File.dirname(__FILE__), '..'))
 
-  # show retry status in spec process
-  c.verbose_retry = true
-  # show exception that triggers a retry if verbose_retry is set to true
-  c.display_try_failure_messages = true
-
   # Configure all nodes in nodeset
   c.before :suite do
     # Install module and deps