Merge pull request #184 from bastelfreak/puppet4

replace validate_* with datatypes

Author: binford2k

.travis.yml

@@ -16,12 +16,6 @@ script: 'bundle exec rake validate && bundle exec rake lint && SPEC_OPTS="--form
 matrix:
   fast_finish: true
   include:
-    - rvm: 1.9.3
-      env: PUPPET_GEM_VERSION="~> 3.0"
-    - rvm: 2.1.5
-      env: PUPPET_GEM_VERSION="~> 3.0"
-    - rvm: 2.1.5
-      env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
     - rvm: 2.1.6
       env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
     - rvm: 2.3.1

manifests/init.pp

@@ -1,9 +1,9 @@
 # == Class: lvm
 #
 class lvm (
-  $package_ensure = 'installed',
-  $manage_pkg     = undef,
-  $volume_groups  = {},
+  Enum['installed', 'present', 'latest', 'absent'] $package_ensure = 'installed',
+  Boolean $manage_pkg                                              = false,
+  Hash $volume_groups                                              = {},
 ) {
 
   if $manage_pkg {
@@ -12,7 +12,5 @@
     }
   }
 
-  validate_hash($volume_groups)
-
   create_resources('lvm::volume_group', $volume_groups)
 }

manifests/logical_volume.pp

@@ -2,40 +2,34 @@
 #
 define lvm::logical_volume (
   $volume_group,
-  $size              = undef,
-  $initial_size      = undef,
-  $ensure            = present,
-  $options           = 'defaults',
-  $pass              = '2',
-  $dump              = '0',
-  $fs_type           = 'ext4',
-  $mkfs_options      = undef,
-  $mountpath         = "/${name}",
-  $mountpath_require = false,
-  $mounted           = true,
-  $createfs          = true,
-  $extents           = undef,
-  $stripes           = undef,
-  $stripesize        = undef,
-  $readahead         = undef,
-  $range             = undef,
-  $size_is_minsize   = undef,
-  $type              = undef,
-  $thinpool          = false,
-  $poolmetadatasize  = undef,
-  $mirror            = undef,
-  $mirrorlog         = undef,
-  $no_sync           = undef,
-  $region_size       = undef,
-  $alloc             = undef,
+  $size                             = undef,
+  $initial_size                     = undef,
+  Enum['absent', 'present'] $ensure = present,
+  $options                          = 'defaults',
+  $pass                             = '2',
+  $dump                             = '0',
+  $fs_type                          = 'ext4',
+  $mkfs_options                     = undef,
+  Stdlib::Absolutepath $mountpath   = "/${name}",
+  Boolean $mountpath_require        = false,
+  Boolean $mounted                  = true,
+  Boolean $createfs                 = true,
+  $extents                          = undef,
+  $stripes                          = undef,
+  $stripesize                       = undef,
+  $readahead                        = undef,
+  $range                            = undef,
+  $size_is_minsize                  = undef,
+  $type                             = undef,
+  $thinpool                         = false,
+  $poolmetadatasize                 = undef,
+  $mirror                           = undef,
+  $mirrorlog                        = undef,
+  $no_sync                          = undef,
+  $region_size                      = undef,
+  $alloc                            = undef,
 ) {
 
-  validate_bool($mountpath_require)
-
-  if ($name == undef) {
-    fail("lvm::logical_volume \$name can't be undefined")
-  }
-
   $lvm_device_path = "/dev/${volume_group}/${name}"
 
   if $mountpath_require and $fs_type != 'swap' {

manifests/volume_group.pp

@@ -1,19 +1,13 @@
 # == Define: lvm::volume_group
 #
 define lvm::volume_group (
-  $physical_volumes,
-  $createonly       = false,
-  $ensure           = present,
-  $logical_volumes  = {},
-  $followsymlinks   = false,
+  Variant[Array, String] $physical_volumes,
+  Boolean $createonly               = false,
+  Enum['present', 'absent'] $ensure = present,
+  Hash $logical_volumes             = {},
+  Boolean $followsymlinks           = false,
 ) {
 
-  validate_hash($logical_volumes)
-
-  if ($name == undef) {
-    fail("lvm::volume_group \$name can't be undefined")
-  }
-
   if is_hash($physical_volumes) {
     create_resources(
       'lvm::physical_volume',

metadata.json

@@ -8,7 +8,10 @@
   "project_page": "https://github.com/puppetlabs/puppetlabs-lvm",
   "issues_url": "https://tickets.puppetlabs.com/browse/MODULES/component/11456/",
   "dependencies": [
-    {"name":"puppetlabs/stdlib","version_requirement":">=4.1.0 < 5.0.0"}
+    {
+      "name": "puppetlabs/stdlib",
+      "version_requirement": ">= 4.13.1 < 5.0.0"
+    }
   ],
   "data_provider": null,
   "operatingsystem_support": [
@@ -32,12 +35,15 @@
     },
     {
       "operatingsystem": "AIX"
+    },
+    {
+      "operatingsystem": "Archlinux"
     }
   ],
   "requirements": [
     {
       "name": "puppet",
-      "version_requirement": ">= 3.0.0 < 5.0.0"
+      "version_requirement": ">= 4.6.1 < 5.0.0"
     }
   ]
 }

spec/unit/classes/lvm_spec.rb

@@ -80,7 +80,7 @@
       {
         :volume_groups => {
           'myvg' => {
-            'physical_volumes' => [ '/dev/sda2', '/dev/sda3', ],
+            'physical_volumes' => [ '/dev/sda2', '/dev/sda3' ],
             'logical_volumes'  => {
               'swap'  => {
                 'size'    => '20G',