Merge branch 'master' into master

Author: david22swan

.fixtures.yml

@@ -1,5 +1,7 @@
 fixtures:
   repositories:
     "stdlib": "https://github.com/puppetlabs/puppetlabs-stdlib.git"
+  forge_modules:
+    mount_core: "puppetlabs/mount_core"
   symlinks:
     "lvm": "#{source_dir}"

.travis.yml

@@ -8,7 +8,7 @@ language: ruby
 bundler_args: '--without development system_tests'
 
 before_install:
-  - 'gem update --system'
+  - 'gem update --system $RUBYGEMS_VERSION'
   - 'gem update bundler'
 
 script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--format documentation" bundle exec rake spec'
@@ -17,9 +17,13 @@ matrix:
   fast_finish: true
   include:
     - rvm: 2.1.6
-      env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+      env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes" RUBYGEMS_VERSION=2.7.8
     - rvm: 2.3.1
       env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
+    - rvm: 2.4.4
+      env: PUPPET_GEM_VERSION="~> 5.0" STRICT_VARIABLES="yes"
+    - rvm: 2.5.1
+      env: PUPPET_GEM_VERSION="~> 6.0" STRICT_VARIABLES="yes"
 
 notifications:
   email: false

lib/facter/lvm_support.rb

@@ -15,8 +15,10 @@
 Facter.add('lvm_vgs') do
   confine :lvm_support => true
 
-  vgs = Facter::Core::Execution.execute('vgs -o name --noheadings 2>/dev/null', timeout: 30)
-
+  if Facter.value(:lvm_support)
+    vgs = Facter::Core::Execution.execute('vgs -o name --noheadings 2>/dev/null', timeout: 30)
+  end
+  
   if vgs.nil?
     setcode { 0 }
   else
@@ -46,8 +48,9 @@
 pv_list = []
 Facter.add('lvm_pvs') do
   confine :lvm_support => true
-
-  pvs = Facter::Core::Execution.execute('pvs -o name --noheadings 2>/dev/null', timeout: 30)
+  if Facter.value(:lvm_support)
+    pvs = Facter::Core::Execution.execute('pvs -o name --noheadings 2>/dev/null', timeout: 30)
+  end
 
   if pvs.nil?
     setcode { 0 }

metadata.json

@@ -11,6 +11,10 @@
     {
       "name": "puppetlabs/stdlib",
       "version_requirement": ">= 4.13.1 < 6.0.0"
+    },
+    {
+      "name": "puppetlabs/mount_core",
+      "version_requirement": ">= 1.0.0 < 2.0.0"      
     }
   ],
   "data_provider": null,

tasks/mount_lv.rb

@@ -4,7 +4,7 @@
 
 # Parse the parameters
 # params = JSON.parse(STDIN.read)
-params = JSON.parse(File.read('/home/vagrant/mount_lv.json'))
+params = JSON.parse(STDIN.read)
 
 # Set parameters to local variables and resolve defaults if required
 volume_group   = params['volume_group']