Merge pull request #16 from puppetlabs/fix-default-case-order

(MODULES-2096) Move default cases last
voxpupuli · Jun 8, 2015 · 7303ed1 · 7303ed1
2 parents 52f9c35 + b28ef88
commit 7303ed1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/manifests/forwarder.pp b/manifests/forwarder.pp
@@ -117,9 +117,9 @@
   # there is non-generic configuration that needs to be declared in addition
   # to the agnostic resources declared here.
   case $::kernel {
-    default: { } # no special configuration needed
     'Linux': { class { 'splunk::platform::posix': splunkd_port => $splunkd_port, } }
     'SunOS': { include splunk::platform::solaris }
+    default: { } # no special configuration needed
   }
 
   # Realize resources shared between server and forwarder profiles, and set up

diff --git a/manifests/init.pp b/manifests/init.pp
@@ -115,9 +115,9 @@
   # there is non-generic configuration that needs to be declared in addition
   # to the agnostic resources declared here.
   case $::kernel {
-    default: { } # no special configuration needed
     'Linux': { include splunk::platform::posix   }
     'SunOS': { include splunk::platform::solaris }
+    default: { } # no special configuration needed
   }
 
   # Realize resources shared between server and forwarder profiles, and set up

diff --git a/manifests/params.pp b/manifests/params.pp
@@ -82,7 +82,6 @@
 
   # Settings common to a kernel
   case $::kernel {
-    default: { fail("splunk module does not support kernel ${::kernel}") }
     'Linux': {
       $path_delimiter       = '/'
       $forwarder_src_subdir = 'universalforwarder/linux'
@@ -129,19 +128,19 @@
         'WINEVENTLOG_SET_ENABLE=1',
       ]
     }
+    default: { fail("splunk module does not support kernel ${::kernel}") }
   }
 
   # Settings common to an OS family
   case $::osfamily {
-    default:   { $pkg_provider = undef  } # Don't define a $pkg_provider
     'RedHat':  { $pkg_provider = 'rpm'  }
     'Debian':  { $pkg_provider = 'dpkg' }
     'Solaris': { $pkg_provider = 'sun'  }
+    default:   { $pkg_provider = undef  } # Don't define a $pkg_provider
   }
 
   # Settings specific to an architecture as well as an OS family
   case "${::osfamily} ${::architecture}" {
-    default: { fail("unsupported osfamily/arch ${::osfamily}/${::architecture}") }
     'RedHat i386': {
       $package_suffix       = "${version}-${build}.i386.rpm"
       $forwarder_pkg_name   = 'splunkforwarder'
@@ -182,6 +181,7 @@
       $forwarder_pkg_name   = 'splunkforwarder'
       $server_pkg_name      = 'splunk'
     }
+    default: { fail("unsupported osfamily/arch ${::osfamily}/${::architecture}") }
   }
 
   $forwarder_src_pkg = "splunkforwarder-${package_suffix}"