Skip to content

Commit

Permalink
Cleaning up for chef 0.10.8
Browse files Browse the repository at this point in the history
  • Loading branch information
xdissent committed Dec 18, 2011
1 parent 17ff75c commit f91bef8
Show file tree
Hide file tree
Showing 7 changed files with 10 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .chef/bootstrap/ubuntu10.04-gems-hatch.erb
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ if [ ! -f /usr/bin/chef-client ]; then
fi

gem install ohai --no-rdoc --no-ri --verbose
gem install chef --no-rdoc --no-ri --verbose <%= bootstrap_version_string %>
gem install chef --no-rdoc --no-ri --verbose --version 0.10.8

mkdir -p /etc/chef

Expand Down
2 changes: 1 addition & 1 deletion .chef/bootstrap/vagrant-hatch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ if [ ! -f /usr/bin/chef-client ]; then
ruby setup.rb --no-format-executable
gem install ohai --no-rdoc --no-ri --verbose
gem install chef --no-rdoc --no-ri --verbose
gem install chef --no-rdoc --no-ri --verbose --version 0.10.8
gem install rake --no-rdoc --no-ri --verbose
fi
Expand Down
2 changes: 1 addition & 1 deletion .chef/plugins/knife/hatch.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
gem 'chef', '=0.10.4'
gem 'chef', '=0.10.8'

module HatchKnifePlugins

Expand Down
6 changes: 3 additions & 3 deletions .rvmrc
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
rvm ruby-1.8.7-p249@chef-hatch-repo --create
rvm use 1.9.3@chef-hatch-repo-0.1.2 --create

if ! command -v knife ; then
gem install chef -v 0.10.4
gem install chef --no-rdoc --no-ri --version 0.10.8
fi

if ! command -v vagrant ; then
gem install vagrant -v 0.8.7
gem install vagrant --no-rdoc --no-ri --version 0.8.10
fi
4 changes: 2 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## 0.1.2 (October 15, 2011)

- Support for Chef 0.10.4
- Support for Vagrant 0.8.7
- Support for Chef 0.10.8
- Support for Vagrant 0.8.10
- Data bags work remotely and locally

## 0.1.1 (July 23, 2011)
Expand Down
1 change: 1 addition & 0 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ Vagrant::Config.run do |config|
vm_config.vm.box_url = "http://files.vagrantup.com/lucid64.box"
vm_config.vm.provision HatchProvisioner do |chef|
chef.node_name = "chef.local"
chef.environment = "production"
chef.add_role("chef_server")
end
end
Expand Down
1 change: 1 addition & 0 deletions hatch_provisioner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,7 @@ def setup_knife_config
cache_type 'BasicFile'
cache_options( :path => '#{cwd}/.chef/checksums' )
cookbook_path [ '#{cwd}/cookbooks' ]
environment '#{config.environment}'
END_CONF
config_file = File.new("#{cwd}/.chef/knife.rb", "w")
config_file.write(conf)
Expand Down

0 comments on commit f91bef8

Please sign in to comment.