From 9ce1c7f2eaaf6163254c37d6dddc20d26f076be8 Mon Sep 17 00:00:00 2001
From: Ciaby <ciaby@rhizomatica.org>
Date: Mon, 1 Jun 2015 12:41:06 -0500
Subject: [PATCH] Pulled latest version of puppet riak module Configured riak
 to install latest version (2.1+)

---
 modules/rhizo_base/manifests/riak.pp | 51 ++++++++++++++++++++++++++--
 modules/riak                         |  2 +-
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/modules/rhizo_base/manifests/riak.pp b/modules/rhizo_base/manifests/riak.pp
index 5e1abee..3c14865 100644
--- a/modules/rhizo_base/manifests/riak.pp
+++ b/modules/rhizo_base/manifests/riak.pp
@@ -12,8 +12,53 @@
 #
 class rhizo_base::riak {
   class { '::riak':
-      version         => '1.4.10-1',
-      template        => 'rhizo_base/app.config.erb',
-      vmargs_template => 'rhizo_base/vm.args.erb',
+      package_name   => 'riak',   # default
+      service_name   => 'riak',   # default
+      manage_package => true,     # default
+      manage_repo    => true,     # default
+      version        => 'latest', # default, use a package version if desired
+      # settings in the settings hash are written directly to settings.conf.
+      settings       => {
+        'anti_entropy'                      => 'active',
+        'bitcask.data_root'                 => '$(platform_data_dir)/bitcask',
+        'bitcask.io_mode'                   => 'erlang',
+        'distributed_cookie'                => 'riak',
+        'dtrace'                            => 'off',
+        'erlang.async_threads'              => '64',
+        'erlang.max_ports'                  => '65536',
+        'leveldb.maximum_memory.percent'    => '70',
+        'listener.http.internal'            => "$vpn_ip_address:8098",
+        'listener.protobuf.internal'        => "$vpn_ip_address:8087",
+        'log.console'                       => 'file',
+        'log.console.file'                  => '$(platform_log_dir)/console.log',
+        'log.console.level'                 => 'info',
+        'log.crash.file'                    => '$(platform_log_dir)/crash.log',
+        'log.crash.maximum_message_size'    => '64KB',
+        'log.crash'                         => 'on',
+        'log.crash.rotation'                => '$D0',
+        'log.crash.rotation.keep'           => '5',
+        'log.crash.size'                    => '10MB',
+        'log.error.file'                    => '$(platform_log_dir)/error.log',
+        'log.syslog'                        => 'off',
+        'nodename'                          => "riak@${::fqdn}",
+        'object.format'                     => '1',
+        'object.siblings.maximum'           => '100',
+        'object.siblings.warning_threshold' => '25',
+        'object.size.maximum'               => '50MB',
+        'object.size.warning_threshold'     => '5MB',
+        'platform_bin_dir'                  => '/usr/sbin',
+        'platform_data_dir'                 => '/var/lib/riak',
+        'platform_etc_dir'                  => '/etc/riak',
+        'platform_lib_dir'                  => '/usr/lib64/riak/lib',
+        'platform_log_dir'                  => '/var/log/riak',
+        'riak_control.auth.mode'            => 'off',
+        'riak_control'                      => 'off',
+        'search'                            => 'off',
+        'search.solr.jmx_port'              => '8985',
+        'search.solr.jvm_options'           => '-d64 -Xms1g -Xmx1g -XX:+UseStringCache -XX:+UseCompressedOops',
+        'search.solr.port'                  => '8093',
+        'search.solr.start_timeout'         => '30s',
+        'storage_backend'                   => 'leveldb',
+      }
     }
   }
\ No newline at end of file
diff --git a/modules/riak b/modules/riak
index 6d00e52..84e01ad 160000
--- a/modules/riak
+++ b/modules/riak
@@ -1 +1 @@
-Subproject commit 6d00e5285c7fc0ed538a7a3dec3f176dc5fd97e3
+Subproject commit 84e01ad925be944f3d11b1fb573e784a960f9ad8