Merge pull request #1545 from HelenCampbell/slesFix

[MODULES-3548] SLES 12 fix
puppetlabs · Oct 27, 2016 · 5d2e65e · 5d2e65e
2 parents 34a6b36 + 1729c0e
commit 5d2e65e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/manifests/mod/cgi.pp b/manifests/mod/cgi.pp
@@ -1,6 +1,7 @@
 class apache::mod::cgi {
   case $::osfamily {
     'FreeBSD': {}
+    'Suse': {}
     default: {
       Class['::apache::mod::prefork'] -> Class['::apache::mod::cgi']
     }

diff --git a/manifests/version.pp b/manifests/version.pp
@@ -36,7 +36,11 @@
       $default = '2.4'
     }
     'Suse': {
-      $default = '2.2'
+      if $::operatingsystem == 'SLES' and $::operatingsystemrelease == '12' {
+        $default = '2.4'
+      } else {
+        $default = '2.2'
+      }
     }
     default: {
       fail("Class['apache::version']: Unsupported osfamily: ${::osfamily}")

diff --git a/spec/classes/mod/ssl_spec.rb b/spec/classes/mod/ssl_spec.rb
@@ -103,7 +103,7 @@
       {
         :osfamily               => 'Suse',
         :operatingsystem        => 'SLES',
-        :operatingsystemrelease => '11.2',
+        :operatingsystemrelease => '12',
         :concat_basedir         => '/dne',
         :id                     => 'root',
         :kernel                 => 'Linux',