Merge pull request #44 from rightscale-cookbooks/ohai-3

pinning ohai, eph_lvm, rightscale_tag, machine_tag
rightscale-cookbooks · May 25, 2016 · ac985e2 · ac985e2
2 parents 93abdc0 + 9833f5c
commit ac985e2
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -2,7 +2,7 @@ language: ruby
 rvm:
 - 2.0.0
 - 1.9.3
-before_script: bundle exec berks install
+before_script: cat Berksfile; bundle exec berks install; bundle exec berks list -d
 script: bundle exec strainer test --except kitchen
 notifications:
   slack:

diff --git a/Berksfile b/Berksfile
@@ -5,14 +5,15 @@ metadata
 cookbook 'collectd', github: 'rightscale-cookbooks-contrib/chef-collectd', branch: 'generalize_install_for_both_centos_and_ubuntu'
 cookbook 'mysql', github: 'rightscale-cookbooks-contrib/mysql', branch: 'rs-fixes'
 cookbook 'dns', github: 'rightscale-cookbooks-contrib/dns', branch: 'rightscale_development_v2'
-#cookbook 'build-essential', '~> 2.2.4'
+cookbook 'build-essential', '~> 1.4'
 cookbook 'database', github: 'rightscale-cookbooks-contrib/database', branch: 'rs-fixes'
 
-cookbook 'rightscale_backup',github: 'rightscale-cookbooks/rightscale_backup'
-cookbook 'rightscale_volume',github: 'rightscale-cookbooks/rightscale_volume'
-cookbook 'rightscale_tag',github: 'rightscale-cookbooks/rightscale_tag'
-cookbook 'machine_tag',github: 'rightscale-cookbooks/machine_tag'
-cookbook 'ephemeral_lvm',github:'rightscale-cookbooks/ephemeral_lvm'
+cookbook 'rightscale_backup',github: 'rightscale-cookbooks/rightscale_backup', branch: 'v1.2.0'
+cookbook 'rightscale_volume',github: 'rightscale-cookbooks/rightscale_volume', branch: 'v1.3.0'
+cookbook 'rightscale_tag',github: 'rightscale-cookbooks/rightscale_tag', branch: 'v1.1.0'
+cookbook 'machine_tag',github: 'rightscale-cookbooks/machine_tag', branch: 'v1.1.0'
+cookbook 'ephemeral_lvm',github:'rightscale-cookbooks/ephemeral_lvm', branch: 'v1.0.12'
+cookbook 'ohai', '= 2.1.0'
 
 group :integration do
   cookbook 'runit', '1.6.0'

diff --git a/metadata.rb b/metadata.rb
@@ -18,6 +18,9 @@
 depends 'rightscale_backup', '~> 1.2.0'
 depends 'dns', '~> 0.1.3'
 depends 'git', '~> 4.0.2'
+depends 'aws', '~> 2.9.3'
+depends 'ohai', '~> 2.1.0'
+depends 'build-essential', '~> 1.4'
 
 recipe 'rs-mysql::default', 'Sets up a standalone MySQL server'
 recipe 'rs-mysql::collectd', 'Sets up collectd monitoring for MySQL server'