Merge pull request #324 from david22swan/MODULES-7562

(MODULES-7562) - Addition of support for Ubuntu 18.04 to haproxy
puppetlabs · Aug 1, 2018 · 6215a5e · 6215a5e
2 parents 1efa6fa + 6ec3af5
commit 6215a5e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -969,9 +969,9 @@ This type will setup a additional defaults configuration block inside the haprox
 This module is tested and officially supported on the following platforms:
 
 * RHEL versions 5, 6, and 7
-* Ubuntu versions 10.04, 12.04, and 14.04
-* Debian versions 6 and 7
-* Scientific Linux versions 5, 6, and 7
+* Ubuntu versions 14.04, 16.04 and 18.04
+* Debian versions 8 and 9
+* Scientific Linux versions 6, and 7
 * CentOS versions 5, 6, and 7
 * Oracle Linux versions 5, 6, and 7
 

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, }
         }