diff --git a/.kitchen.yml b/.kitchen.yml index 8cc3602..b1f1c5f 100644 --- a/.kitchen.yml +++ b/.kitchen.yml @@ -54,7 +54,7 @@ platforms: - name: ubuntu-12.04 run_list: - recipe[apt] - - name: centos-6 + - name: centos-6.6 run_list: - recipe[yum] diff --git a/Berksfile b/Berksfile index da47cd8..817376d 100644 --- a/Berksfile +++ b/Berksfile @@ -4,9 +4,6 @@ metadata cookbook 'java' -# until https://github.com/elastic/cookbook-elasticsearch/pull/230 -cookbook 'elasticsearch', '~> 0.3', git:'git@github.com:racker/cookbook-elasticsearch.git' - group :integration do cookbook 'wrapper', path: 'test/fixtures/cookbooks/wrapper' cookbook 'apt' diff --git a/Gemfile b/Gemfile index 8b0abcd..2b33b54 100644 --- a/Gemfile +++ b/Gemfile @@ -17,7 +17,7 @@ group :kitchen_common do end group :kitchen_vagrant do - gem 'kitchen-vagrant' + gem 'kitchen-vagrant', '< 0.17.0' gem 'vagrant-wrapper' end diff --git a/metadata.rb b/metadata.rb index 84864f8..5551bc1 100644 --- a/metadata.rb +++ b/metadata.rb @@ -10,8 +10,8 @@ depends 'apt' depends 'build-essential' depends 'chef-sugar' -depends 'cron', '~> 1.4.3' -depends 'elasticsearch', '~> 0.3' +depends 'cron' +depends 'elasticsearch', '~> 0.3.14' # 1.0 release is a radical change, needs work depends 'firewall' depends 'htpasswd' depends 'kibana_lwrp'