razorsedge · pmuller · Feb 19, 2018 · Feb 19, 2018 · Feb 19, 2018 · Feb 19, 2018
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -1,5 +1,10 @@
 fixtures:
   repositories:
-    stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
+    stdlib:
+      repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
+      ref: '4.24.0'
+    ip:
+      repo: 'https://github.com/thrnio/puppet-ip.git'
+      ref: 'v1.0.0'
   symlinks:
     network: "#{source_dir}"
diff --git a/.travis.yml b/.travis.yml
@@ -14,25 +14,10 @@ script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake
 matrix:
   fast_finish: true
   include:
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 1.9.3
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.0"
-  - rvm: 2.0.0
-    env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
   - rvm: 2.1.9
     env: PUPPET_GEM_VERSION="~> 4.0"
   - rvm: 2.4.1
     env: PUPPET_GEM_VERSION="~> 5.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
-  - rvm: 1.8.7
-    env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
-  allow_failures:
-  - rvm: 2.4.1
-    env: PUPPET_GEM_VERSION="~> 5.0"
 notifications:
   email:
     - [email protected]
diff --git a/README.md b/README.md
@@ -195,7 +195,7 @@ Bonded master interface - bridged (the corresponding network::bridge::* may also
 Bonded slave interface:
 
     network::bond::slave { 'eth1':
-      macaddress   => $macaddress_eth1,
+      macaddress   => $::networking['interfaces']['eth1']['mac'],
       ethtool_opts => 'autoneg off speed 1000 duplex full',
       master       => 'bond0',
     }
@@ -322,7 +322,7 @@ The Hiera naming substitutes underscore for any secondary double colons, i.e. sp
 Notes
 -----
 
-* Runs under Puppet 2.7 and later.
+* Runs under Puppet 4.9 and later.
 * Only works with RedHat-ish systems.
 * Read /usr/share/doc/initscripts-*/sysconfig.txt for underlying details.
 * Read /usr/share/doc/kernel-doc-*/Documentation/networking/bonding.txt for underlying details.

diff --git a/TODO.md b/TODO.md
@@ -30,7 +30,10 @@ and remove the interface.
 
         network::bond::dynamic { "bond2":
           slaves       => [ "eth4", "eth7", ],
-          macaddress   => [ $macaddress_eth4, $macaddress_eth7, ],
+          macaddress   => [
+            $::networking['interfaces']['eth4']['mac'],
+            $::networking['interfaces']['eth7']['mac'],
+          ],
           bonding_opts => "mode=active-backup",
           mtu          => "1500",
           ethtool_opts => "speed 100 duplex full autoneg off",

diff --git a/manifests/alias.pp b/manifests/alias.pp
@@ -37,23 +37,18 @@
 # Copyright (C) 2011 Mike Arnold, unless otherwise noted.
 #
 define network::alias (
-  $ensure,
-  $ipaddress,
-  $netmask,
-  $gateway = undef,
-  $noaliasrouting = false,
-  $ipv6address = undef,
-  $ipv6gateway = undef,
-  $userctl = false,
-  $zone = undef,
-  $metric = undef,
-  $restart = true,
+  Enum['up', 'down'] $ensure,
+  IP::Address::V4::NoSubnet $ipaddress,
+  IP::Address::V4::NoSubnet $netmask,
+  Optional[IP::Address::V4::NoSubnet] $gateway = undef,
+  Boolean $noaliasrouting = false,
+  Optional[IP::Address::V6] $ipv6address = undef,
+  Optional[IP::Address::V6::NoSubnet] $ipv6gateway = undef,
+  Boolean $userctl = false,
+  Optional[String] $zone = undef,
+  Optional[String] $metric = undef,
+  Boolean $restart = true,
 ) {
-  # Validate our data
-  if ! is_ip_address($ipaddress) { fail("${ipaddress} is not an IP address.") }
-  # Validate our booleans
-  validate_bool($noaliasrouting)
-  validate_bool($userctl)
 
   network_if_base { $title:
     ensure         => $ensure,
@@ -63,11 +58,8 @@
     noaliasrouting => $noaliasrouting,
     ipv6address    => $ipv6address,
     ipv6gateway    => $ipv6gateway,
-    macaddress     => '',
     bootproto      => 'none',
     userctl        => $userctl,
-    mtu            => '',
-    ethtool_opts   => '',
     isalias        => true,
     zone           => $zone,
     metric         => $metric,

diff --git a/manifests/alias/range.pp b/manifests/alias/range.pp
@@ -38,28 +38,16 @@
 # Copyright (C) 2013 Mike Arnold, unless otherwise noted.
 #
 define network::alias::range (
-  $ensure,
-  $ipaddress_start,
-  $ipaddress_end,
-  $clonenum_start,
-  $noaliasrouting = false,
-  $restart = true,
-  $netmask = false,
-  $broadcast = false,
-  $arpcheck = true,
+  Enum['up', 'down', 'absent'] $ensure,
+  IP::Address::V4::NoSubnet $ipaddress_start,
+  IP::Address::V4::NoSubnet $ipaddress_end,
+  String $clonenum_start,
+  Boolean $noaliasrouting = false,
+  Boolean $restart = true,
+  Optional[IP::Address::V4::NoSubnet] $netmask = undef,
+  Optional[IP::Address::V4::NoSubnet] $broadcast = undef,
+  Boolean $arpcheck = true,
 ) {
-  # Validate our data
-  if ! is_ip_address($ipaddress_start) { fail("${ipaddress_start} is not an IP address.") }
-  if ! is_ip_address($ipaddress_end) { fail("${ipaddress_end} is not an IP address.") }
-  if $netmask and !is_ip_address($netmask) { fail("${netmask} is not an IP address.") }
-  if $broadcast and !is_ip_address($broadcast) { fail("${broadcast} is not an IP address.") }
-  # Validate our booleans
-  validate_bool($noaliasrouting)
-  validate_bool($restart)
-  validate_bool($arpcheck)
-  # Validate our regular expressions
-  $states = [ '^up$', '^down$', '^absent$' ]
-  validate_re($ensure, $states, '$ensure must be either "up", "down", or "absent".')
 
   include '::network'
 

diff --git a/manifests/bond.pp b/manifests/bond.pp
@@ -32,26 +32,17 @@
 # Copyright (C) 2015 Jason Vervlied, unless otherwise noted.
 #
 define network::bond (
-  $ensure,
-  $mtu = undef,
-  $ethtool_opts = undef,
-  $bonding_opts = 'miimon=100',
-  $zone = undef,
-  $restart = true,
+  Enum['up', 'down'] $ensure,
+  Optional[String] $mtu = undef,
+  Optional[String] $ethtool_opts = undef,
+  String $bonding_opts = 'miimon=100',
+  Optional[String] $zone = undef,
+  Boolean $restart = true,
 ) {
-  # Validate our regular expressions
-  $states = [ '^up$', '^down$' ]
-  validate_re($ensure, $states, '$ensure must be either "up" or "down".')
 
   network_if_base { $title:
     ensure       => $ensure,
-    ipaddress    => '',
-    netmask      => '',
-    gateway      => '',
-    macaddress   => '',
     bootproto    => 'none',
-    ipv6address  => '',
-    ipv6gateway  => '',
     mtu          => $mtu,
     ethtool_opts => $ethtool_opts,
     bonding_opts => $bonding_opts,
@@ -61,10 +52,10 @@
 
   # Only install "alias bondN bonding" on old OSs that support
   # /etc/modprobe.conf.
-  case $::operatingsystem {
+  case $::os['name'] {
     /^(RedHat|CentOS|OEL|OracleLinux|SLC|Scientific)$/: {
-      case $::operatingsystemrelease {
-        /^[45]/: {
+      case $::os['release']['major'] {
+        /^[45]$/: {
           augeas { "modprobe.conf_${title}":
             context => '/files/etc/modprobe.conf',
             changes => [
@@ -79,7 +70,7 @@
       }
     }
     'Fedora': {
-      case $::operatingsystemrelease {
+      case $::os['release']['major'] {
         /^(1|2|3|4|5|6|7|8|9|10|11)$/: {
           augeas { "modprobe.conf_${title}":
             context => '/files/etc/modprobe.conf',

diff --git a/manifests/bond/bridge.pp b/manifests/bond/bridge.pp
@@ -34,26 +34,17 @@
 # Copyright (C) 2013 Mike Arnold, unless otherwise noted.
 #
 define network::bond::bridge (
-  $ensure,
-  $bridge,
-  $mtu = undef,
-  $ethtool_opts = undef,
-  $bonding_opts = 'miimon=100',
-  $restart = true,
+  Enum['up', 'down'] $ensure,
+  String $bridge,
+  Optional[String] $mtu = undef,
+  Optional[String] $ethtool_opts = undef,
+  String $bonding_opts = 'miimon=100',
+  Boolean $restart = true,
 ) {
-  # Validate our regular expressions
-  $states = [ '^up$', '^down$' ]
-  validate_re($ensure, $states, '$ensure must be either "up" or "down".')
 
   network_if_base { $title:
     ensure       => $ensure,
-    ipaddress    => '',
-    netmask      => '',
-    gateway      => '',
-    macaddress   => '',
     bootproto    => 'none',
-    ipv6address  => '',
-    ipv6gateway  => '',
     mtu          => $mtu,
     ethtool_opts => $ethtool_opts,
     bonding_opts => $bonding_opts,
@@ -63,10 +54,10 @@
 
   # Only install "alias bondN bonding" on old OSs that support
   # /etc/modprobe.conf.
-  case $::operatingsystem {
+  case $::os['name'] {
     /^(RedHat|CentOS|OEL|OracleLinux|SLC|Scientific)$/: {
-      case $::operatingsystemrelease {
-        /^[45]/: {
+      case $::os['release']['major'] {
+        /^[45]$/: {
           augeas { "modprobe.conf_${title}":
             context => '/files/etc/modprobe.conf',
             changes => [
@@ -81,7 +72,7 @@
       }
     }
     'Fedora': {
-      case $::operatingsystemrelease {
+      case $::os['release']['major'] {
         /^(1|2|3|4|5|6|7|8|9|10|11)$/: {
           augeas { "modprobe.conf_${title}":
             context => '/files/etc/modprobe.conf',

diff --git a/manifests/bond/dynamic.pp b/manifests/bond/dynamic.pp
@@ -36,28 +36,19 @@
 # Copyright (C) 2011 Mike Arnold, unless otherwise noted.
 #
 define network::bond::dynamic (
-  $ensure,
-  $mtu = undef,
-  $ethtool_opts = undef,
-  $bonding_opts = 'miimon=100',
-  $zone = undef,
-  $defroute = undef,
-  $metric = undef,
-  $restart = true,
+  Enum['up', 'down'] $ensure,
+  Optional[String] $mtu = undef,
+  Optional[String] $ethtool_opts = undef,
+  String $bonding_opts = 'miimon=100',
+  Optional[String] $zone = undef,
+  Optional[String] $defroute = undef,
+  Optional[String] $metric = undef,
+  Boolean $restart = true,
 ) {
-  # Validate our regular expressions
-  $states = [ '^up$', '^down$' ]
-  validate_re($ensure, $states, '$ensure must be either "up" or "down".')
 
   network_if_base { $title:
     ensure       => $ensure,
-    ipaddress    => '',
-    netmask      => '',
-    gateway      => '',
-    macaddress   => '',
     bootproto    => 'dhcp',
-    ipv6address  => '',
-    ipv6gateway  => '',
     mtu          => $mtu,
     ethtool_opts => $ethtool_opts,
     bonding_opts => $bonding_opts,
@@ -69,10 +60,10 @@
 
   # Only install "alias bondN bonding" on old OSs that support
   # /etc/modprobe.conf.
-  case $::operatingsystem {
+  case $::os['name'] {
     /^(RedHat|CentOS|OEL|OracleLinux|SLC|Scientific)$/: {
-      case $::operatingsystemrelease {
-        /^[45]/: {
+      case $::os['release']['major'] {
+        /^[45]$/: {
           augeas { "modprobe.conf_${title}":
             context => '/files/etc/modprobe.conf',
             changes => [
@@ -87,7 +78,7 @@
       }
     }
     'Fedora': {
-      case $::operatingsystemrelease {
+      case $::os['release']['major'] {
         /^(1|2|3|4|5|6|7|8|9|10|11)$/: {
           augeas { "modprobe.conf_${title}":
             context => '/files/etc/modprobe.conf',

diff --git a/manifests/bond/slave.pp b/manifests/bond/slave.pp
@@ -26,7 +26,7 @@
 # === Sample Usage:
 #
 #   network::bond::slave { 'eth1':
-#     macaddress => $::macaddress_eth1,
+#     macaddress => $::networking['interfaces']['eth1']['mac'],
 #     master     => 'bond0',
 #   }
 #
@@ -39,24 +39,17 @@
 # Copyright (C) 2011 Mike Arnold, unless otherwise noted.
 #
 define network::bond::slave (
-  $master,
-  $macaddress = undef,
-  $ethtool_opts = undef,
-  $zone = undef,
-  $defroute = undef,
-  $metric = undef,
-  $restart = true,
-  $userctl = false,
-  $bootproto = undef,
-  $onboot = undef,
+  String $master,
+  Optional[Stdlib::MAC] $macaddress = undef,
+  Optional[String] $ethtool_opts = undef,
+  Optional[String] $zone = undef,
+  Optional[String] $defroute = undef,
+  Optional[String] $metric = undef,
+  Boolean $restart = true,
+  Boolean $userctl = false,
+  Optional[Network::If::Bootproto] $bootproto = undef,
+  Optional[String] $onboot = undef,
 ) {
-  # Validate our data
-  if $macaddress and ! is_mac_address($macaddress) {
-    fail("${macaddress} is not a MAC address.")
-  }
-  # Validate our booleans
-  validate_bool($restart)
-  validate_bool($userctl)
 
   include '::network'