(MODULES-7562) - Addition of support for Ubuntu 18.04 to haproxy

puppetlabs · Jul 31, 2018 · 0c1a50f · 0c1a50f
1 parent 1efa6fa
commit 0c1a50f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/metadata.json b/metadata.json
@@ -60,7 +60,8 @@
       "operatingsystem": "Ubuntu",
       "operatingsystemrelease": [
         "14.04",
-        "16.04"
+        "16.04",
+        "18.04"
       ]
     }
   ],

diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb
@@ -38,7 +38,7 @@ class { 'epel': before => Package['socat'], }
             onlyif => 'which getenforce && getenforce | grep Enforcing',
           }
         }
-        if ($::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7') or ($::osfamily == 'Debian' and $::operatingsystemmajrelease == '9') {
+        if ($::osfamily == 'RedHat' and $::operatingsystemmajrelease == '7') or ($::osfamily == 'Debian' and ($::operatingsystemmajrelease == '9' or $::operatingsystemmajrelease == '18.04')) {
           # For `netstat` for serverspec
           package { 'net-tools': ensure => present, }
         }