puppet-lint: fix legacy_facts

voxpupuli · Oct 31, 2019 · 8ae82c4 · 8ae82c4
1 parent 811ca4b
commit 8ae82c4
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/manifests/params.pp b/manifests/params.pp
@@ -107,7 +107,8 @@
       }
     }
     'Debian': {
-      if ($facts['os']['name'] == 'ubuntu' and $facts['lsbdistcodename'] in ['lucid', 'precise', 'trusty', 'xenial', 'bionic'])
+      # $facts['os']['distro']['codename'] is not yet well established, so we stick with the legact lsb facts for now
+      if ($facts['os']['name'] == 'ubuntu' and $facts['lsbdistcodename'] in ['lucid', 'precise', 'trusty', 'xenial', 'bionic']) # lint:ignore:legacy_facts
       or ($facts['os']['name'] == 'debian' and $facts['os']['release']['major'] in ['6', '7', '8', '9']) {
         $_module_os_overrides = {
           'manage_repo' => true,

diff --git a/manifests/resource/mailhost.pp b/manifests/resource/mailhost.pp
@@ -140,7 +140,7 @@
 
   # Add IPv6 Logic Check - Nginx service will not start if ipv6 is enabled
   # and support does not exist for it in the kernel.
-  if ($ipv6_enable and !$facts['ipaddress6']) {
+  if ($ipv6_enable and !$facts['networking']['ip6']) {
     warning('nginx: IPv6 support is not enabled or configured properly')
   }
 

diff --git a/manifests/resource/streamhost.pp b/manifests/resource/streamhost.pp
@@ -98,7 +98,7 @@
 
   # Add IPv6 Logic Check - Nginx service will not start if ipv6 is enabled
   # and support does not exist for it in the kernel.
-  if ($ipv6_enable == true) and (!$facts['ipaddress6']) {
+  if ($ipv6_enable == true) and (!$facts['networking']['ip6']) {
     warning('nginx: IPv6 support is not enabled or configured properly')
   }