(Refactor) Significant refactor of memcached module

This commit significantly refactors all manifests:

  - consolidates all manifests into a single class
  - converts to a parameterized class with the same defaults
  - switched to 2 space indentation

These changes are not intended to change any behavior
of the manifests, but it does change how they will be used
going forward:

class { 'memcached':
  package_ensure => 'latest',
  tcp_port => '11212'
  udp_port => '11212',
}

Author: Dan Bode

manifests/config.pp

@@ -1,3 +1,32 @@
-class memcached {
-    include memcached::params, memcached::install, memcached::config, memcached::service
+class memcached(
+  $package_ensure  = 'present',
+  $logfile         = '/var/log/memcached.log',
+  $max_memory      = false,
+  $listen_ip       = '0.0.0.0',
+  $tcp_port        = '11211',
+  $udp_port        = '11211',
+  $user            = 'nobody',
+  $max_connections = '8192'
+) {
+
+  include memcached::params
+
+  package { $memcached::params::package_name:
+    ensure => $package_ensure,
+  }
+
+  file { $memcached::params::config_file:
+    owner   => root,
+    group   => root,
+    content => template("${module_name}/memcached.conf.erb"),
+    require => Package[$memcached::params::package_name],
+  }
+
+  service { $memcached::params::service_name:
+    ensure     => running,
+    enable     => true,
+    hasrestart => true,
+    hasstatus  => false,
+    subscribe  => File[$memcached::params::config_file],
+  }
 }

manifests/init.pp

@@ -1,44 +1,12 @@
 class memcached::params {
-    case $operatingsystem {
-        /(Ubuntu|Debian)/: {
-            $package_name = 'memcached'
-            $service_name = 'memcached'
-            $config_file = '/etc/memcached.conf'
-        }
+  case $::operatingsystem {
+    /(Ubuntu|Debian)/: {
+        $package_name = 'memcached'
+        $service_name = 'memcached'
+        $config_file = '/etc/memcached.conf'
     }
-
-    case $memcached_logfile {
-        '': { $logfile = '/var/log/memcached.log' }
-        default: { $logfile = $memcached_logfile }
-    }
-
-    case $memcached_max_memory {
-        '': { $max_memory = false }
-        default: { $max_memory = $memcached_max_memory }
-    }
-
-    case $memcached_listen_ip {
-        '': { $listen_ip = '0.0.0.0' }
-        default: { $listen_ip = $memcached_listen_ip }
-    }
-
-    case $memcached_tcp_port {
-        '': { $tcp_port = 11211 }
-        default: { $tcp_port = $memcached_tcp_port }
-    }
-
-    case $memcached_udp_port {
-        '': { $udp_port = 11211 }
-        default: { $udp_port = $memcached_udp_port }
-    }
-
-    case $memcached_user {
-        '': { $user = 'nobody' }
-        default: { $user = $memcached_user }
-    }
-
-    case $memcached_max_connections {
-        '': { $max_connections = 8192 }
-        default: { $max_connections = $memcached_max_connections }
+    default: {
+      fail("Unsupported platform: ${::operatingsystem}")
     }
+  }
 }

manifests/install.pp

@@ -7,29 +7,29 @@
 -P /var/run/memcached.pid
 
 # Log memcached's output
-logfile <%= scope.lookupvar('memcached::params::logfile') %>
+logfile <%= logfile %>
 
 # Use <num> MB memory max to use for object storage.
-<% if scope.lookupvar('memcached::params::max_memory') != false -%>
--m <%= scope.lookupvar('memcached::params::max_memory') %>
+<% if max_memory -%>
+-m <%= max_memory %>
 <% else -%>
 -m <%= ((memorysize.to_f*1024)*0.95).floor %>
 <% end -%>
 
 # IP to listen on
--l <%= scope.lookupvar('memcached::params::listen_ip') %>
+-l <%= listen_ip %>
 
 # TCP port to listen on
--p <%= scope.lookupvar('memcached::params::tcp_port') %>
+-p <%= tcp_port %>
 
 # UDP port to listen on
--U <%= scope.lookupvar('memcached::params::udp_port') %>
+-U <%= udp_port %>
 
 # Run daemon as user
--u <%= scope.lookupvar('memcached::params::user') %>
+-u <%= user %>
 
 # Limit the number of simultaneous incoming connections.
--c <%= scope.lookupvar('memcached::params::max_connections') %>
+-c <%= max_connections %>
 
 # Number of threads to use to process incoming requests.
 -t <%= processorcount %>