Use some newer stdlib types

voxpupuli · Mar 2, 2019 · 0ed736a · 0ed736a
1 parent 799ba85
commit 0ed736a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/manifests/host.pp b/manifests/host.pp
@@ -1,11 +1,11 @@
 # == Define: dhcp::host
 #
 define dhcp::host (
-  Stdlib::Compat::Ip_address $ip,
+  Stdlib::IP::Address $ip,
   Dhcp::Mac $mac,
   String $ddns_hostname = $name,
   Hash $options     = {},
-  String $comment   ='',
+  String $comment   = '',
   Boolean $ignored  = false,
 ) {
 

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -2,8 +2,8 @@
 #
 class dhcp (
   Optional[Array[String]] $dnsdomain                      = undef,
-  Array[Stdlib::Compat::Ipv4] $nameservers                = [],
-  Array[Stdlib::Compat::Ipv6] $nameservers_ipv6           = [],
+  Array[Stdlib::IP::Address::V4] $nameservers             = [],
+  Array[Stdlib::IP::Address::V6] $nameservers_ipv6        = [],
   Array[String] $ntpservers                               = [],
   Array[String] $dnssearchdomains                         = [],
   String $dhcp_conf_header                                = 'INTERNAL_TEMPLATE',
@@ -30,7 +30,7 @@
   Integer $max_lease_time                                 = 86400,
   $service_ensure                                         = running,
   $globaloptions                                          = '',
-  Optional[Integer[0,65535]] $omapi_port                  = undef,
+  Optional[Stdlib::Port] $omapi_port                      = undef,
   Optional[String] $omapi_name                            = undef,
   String $omapi_algorithm                                 = 'HMAC-MD5',
   Optional[String] $omapi_key                             = undef,

diff --git a/manifests/pool.pp b/manifests/pool.pp
@@ -1,8 +1,8 @@
 # == Define: dhcp::pool
 #
 define dhcp::pool (
-  Stdlib::Compat::Ipv4 $network,
-  Stdlib::Compat::Ipv4 $mask,
+  Stdlib::IP::Address::V4 $network,
+  Stdlib::IP::Address::V4 $mask,
   $gateway                                  = '',
   $range                                    = '',
   $failover                                 = '',

diff --git a/manifests/pool6.pp b/manifests/pool6.pp
@@ -1,10 +1,7 @@
 # == Define: dhcp::pool6
 #
 define dhcp::pool6 (
-  # the ipv6 regex is currently wrong so we can't use it here
-  # https://github.com/puppetlabs/puppetlabs-stdlib/pull/731
-  # Stdlib::Compat::Ipv6 $network,
-  String $network,
+  Stdlib::IP::Address::V6 $network,
   Integer $prefix,
   String $range                             = '',
   String $range_temp                        = '',

diff --git a/metadata.json b/metadata.json
@@ -10,7 +10,7 @@
   "dependencies": [
     {
       "name": "puppetlabs/stdlib",
-      "version_requirement": ">= 4.16.0 < 6.0.0"
+      "version_requirement": ">= 4.25.0 < 6.0.0"
     },
     {
       "name": "puppetlabs/concat",