Merge pull request #73 from basho/hc-riak-kv-multi-backend

Add a riak_kv_multi_backend case for attribute configuration
basho-labs · Jun 5, 2013 · 17e43f5 · 17e43f5
2 parents 74a9381 + ed5ca5a
commit 17e43f5
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -5,15 +5,15 @@ platforms:
 - name: ubuntu-12.04
   driver_config:
     box: opscode-ubuntu-12.04
-    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_chef-11.4.4.box
-    require_chef_omnibus: 11.4.4
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box
+    require_chef_omnibus: true
   run_list:
   - recipe[apt]
 - name: centos-6.4
   driver_config:
     box: opscode-centos-6.4
-    box_url: http://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_chef-11.4.4.box
-    require_chef_omnibus: 11.4.4
+    box_url: https://opscode-vm.s3.amazonaws.com/vagrant/opscode_centos-6.4_provisionerless.box
+    require_chef_omnibus: true
   run_list:
   - recipe[yum::epel]
 suites:

diff --git a/TESTING.md b/TESTING.md
@@ -8,7 +8,7 @@ Once the above requirements are met, install the additional requirements:
 
 Install the berkshelf plugin for vagrant, and berkshelf to your local Ruby environment.
 
-    vagrant plugin install berkshelf-vagrant
+    vagrant plugin install vagrant-berkshelf
     gem install berkshelf
 
 Install Test Kitchen 1.0 (unreleased yet, use the alpha / prerelease version).

diff --git a/attributes/default.rb b/attributes/default.rb
@@ -103,6 +103,11 @@ class ::Array
     default['riak']['config']['bitcask']['data_root'] = "#{platform_data_dir}/bitcask".to_erl_string
   when "riak_kv_eleveldb_backend"
     default['riak']['config']['eleveldb']['data_root'] = "#{platform_data_dir}/leveldb".to_erl_string
+  when "riak_kv_multi_backend"
+    default['riak']['config']['riak_kv']['multi_backend_default'] = "bitcask_mult"
+    bitcask_mult = ["bitcask_mult", "riak_kv_bitcask_backend", {"data_root" => "#{platform_data_dir}/bitcask".to_erl_string}]
+    eleveldb_mult = ["eleveldb_mult", "riak_kv_eleveldb_backend", {"data_root" => "#{platform_data_dir}/leveldb".to_erl_string}]
+    default['riak']['config']['riak_kv']['multi_backend'] = [bitcask_mult.to_erl_tuple, eleveldb_mult.to_erl_tuple]
   when "riak_cs_kv_multi_backend"
     default['riak']['cs_version'] = "1.3.1"
     if node['platform_family'] == "rhel" && node['kernel']['machine'] == "x86_64"