From b534beab4b2c7de02ab018e20366c3a97cab1f00 Mon Sep 17 00:00:00 2001 From: Hector Castro Date: Wed, 5 Jun 2013 14:04:05 -0400 Subject: [PATCH 1/2] Update Opscode Vagrant boxes so that they are provisionerless. Now Test Kitchen installs Chef. --- .kitchen.yml | 8 ++++---- TESTING.md | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.kitchen.yml b/.kitchen.yml index 2fc216a..625ac84 100644 --- 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 index 062e9b9..e29ff7c 100644 --- 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). From ed5ca5a747409cb56dbe81bdfddb097771aab9da Mon Sep 17 00:00:00 2001 From: Hector Castro Date: Wed, 5 Jun 2013 14:24:46 -0400 Subject: [PATCH 2/2] Add a case for riak_kv_multi_backend in the default attributes that sets up a Bitcask and eLevelDB backend. --- attributes/default.rb | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/attributes/default.rb b/attributes/default.rb index 685fe2a..c3b80c8 100644 --- 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"