Permalink
Browse files

Update cookbooks

  • Loading branch information...
abtris committed Mar 20, 2013
1 parent cdede79 commit 9d98a3361848246abe340da46536b596caf2f08d
Showing with 520 additions and 2,966 deletions.
  1. +7 −3 Vagrantfile
  2. +0 −14 cookbooks/apt/.gitignore
  3. +0 −33 cookbooks/apt/.kitchen.yml
  4. +0 −8 cookbooks/apt/Berksfile
  5. +0 −75 cookbooks/apt/CHANGELOG.md
  6. +0 −29 cookbooks/apt/CONTRIBUTING
  7. +0 −15 cookbooks/apt/Gemfile
  8. +0 −201 cookbooks/apt/LICENSE
  9. +32 −144 cookbooks/apt/README.md
  10. +0 −6 cookbooks/apt/Vagrantfile
  11. +0 −3 cookbooks/apt/attributes/default.rb
  12. +9 −0 cookbooks/apt/files/default/apt-cacher
  13. +144 −0 cookbooks/apt/files/default/apt-cacher.conf
  14. +34 −0 cookbooks/apt/metadata.json
  15. +4 −5 cookbooks/apt/metadata.rb
  16. +0 −61 cookbooks/apt/providers/preference.rb
  17. +39 −104 cookbooks/apt/providers/repository.rb
  18. +15 −30 cookbooks/apt/recipes/cacher-client.rb
  19. +18 −11 cookbooks/apt/recipes/{cacher-ng.rb → cacher.rb}
  20. +4 −15 cookbooks/apt/recipes/default.rb
  21. +0 −30 cookbooks/apt/resources/preference.rb
  22. +0 −10 cookbooks/apt/resources/repository.rb
  23. +0 −2 cookbooks/apt/templates/default/01proxy.erb
  24. +0 −276 cookbooks/apt/templates/default/acng.conf.erb
  25. +0 −270 cookbooks/apt/templates/ubuntu-10.04/acng.conf.erb
  26. +0 −1 cookbooks/apt/test/cookbooks/apt_test/README.md
  27. +0 −28 cookbooks/apt/test/cookbooks/apt_test/files/default/tests/minitest/cacher-ng_test.rb
  28. +0 −28 cookbooks/apt/test/cookbooks/apt_test/files/default/tests/minitest/default_test.rb
  29. +0 −48 cookbooks/apt/test/cookbooks/apt_test/files/default/tests/minitest/lwrps_test.rb
  30. +0 −29 cookbooks/apt/test/cookbooks/apt_test/files/default/tests/minitest/support/helpers.rb
  31. +0 −6 cookbooks/apt/test/cookbooks/apt_test/metadata.rb
  32. +0 −20 cookbooks/apt/test/cookbooks/apt_test/recipes/cacher-ng.rb
  33. +0 −20 cookbooks/apt/test/cookbooks/apt_test/recipes/default.rb
  34. +0 −66 cookbooks/apt/test/cookbooks/apt_test/recipes/lwrps.rb
  35. +0 −5 cookbooks/apt/test/kitchen/Kitchenfile
  36. +0 −7 cookbooks/java/.gitignore
  37. +0 −92 cookbooks/java/CHANGELOG.md
  38. +0 −257 cookbooks/java/CONTRIBUTING.md
  39. +0 −3 cookbooks/java/Gemfile
  40. +0 −201 cookbooks/java/LICENSE
  41. +37 −148 cookbooks/java/README.md
  42. +5 −53 cookbooks/java/attributes/default.rb
  43. +11 −0 cookbooks/java/files/default/java.seed
  44. +0 −25 cookbooks/java/files/default/tests/minitest/openjdk_test.rb
  45. +0 −24 cookbooks/java/files/default/tests/minitest/oracle_test.rb
  46. +50 −0 cookbooks/java/metadata.json
  47. +5 −8 cookbooks/java/metadata.rb
  48. +0 −264 cookbooks/java/providers/ark.rb
  49. +1 −13 cookbooks/java/recipes/default.rb
  50. +12 −70 cookbooks/java/recipes/openjdk.rb
  51. +0 −68 cookbooks/java/recipes/oracle.rb
  52. +0 −52 cookbooks/java/recipes/oracle_i386.rb
  53. +93 −0 cookbooks/java/recipes/sun.rb
  54. +0 −28 cookbooks/java/recipes/windows.rb
  55. +0 −38 cookbooks/java/resources/ark.rb
  56. +0 −6 cookbooks/java/templates/default/oracle.jinfo.erb
  57. +0 −5 cookbooks/java/test/kitchen/Kitchenfile
  58. +0 −1 cookbooks/java/test/kitchen/cookbooks/java_test/README.md
  59. +0 −6 cookbooks/java/test/kitchen/cookbooks/java_test/metadata.rb
  60. +0 −1 cookbooks/java/test/kitchen/cookbooks/java_test/recipes/oracle.rb
View
@@ -8,16 +8,20 @@ Vagrant.configure("2") do |config|
config.vm.synced_folder "data/", "/vagrant/data"
config.vm.define :master do |master|
-# master.vm.provision :chef_solo do |chef|
-# chef.add_recipe "jenkins"
-# end
+ master.vm.provision :chef_solo do |chef|
+ chef.add_recipe "apt"
+ chef.add_recipe "java"
+ chef.add_recipe "jenkins"
+ end
master.vm.network :forwarded_port, guest: 8080, host: 8080
master.vm.network :forwarded_port, guest: 80, host: 3000
master.vm.network :private_network, ip: "33.33.33.10"
end
config.vm.define :slave do |slave|
slave.vm.provision :chef_solo do |chef|
+ chef.add_recipe "apt"
+ chef.add_recipe "java"
chef.add_recipe "jenkins::node_ssh"
end
slave.vm.network :private_network, ip: "33.33.33.20"
View
@@ -1,14 +0,0 @@
-.vagrant
-Berksfile.lock
-Gemfile.lock
-*~
-*#
-.#*
-\#*#
-.*.sw[a-z]
-*.un~
-.bundle
-.cache
-.kitchen
-bin
-.kitchen.local.yml
View
@@ -1,33 +0,0 @@
----
-driver_plugin: vagrant
-platforms:
-- name: ubuntu-12.04
- driver_config:
- box: canonical-ubuntu-12.04
- box_url: http://cloud-images.ubuntu.com/vagrant/precise/current/precise-server-cloudimg-amd64-vagrant-disk1.box
- require_chef_omnibus: 11.4.0
- run_list:
- - recipe[apt]
-- name: ubuntu-10.04
- driver_config:
- box: opscode-ubuntu-10.04
- box_url: http://opscode-vm.s3.amazonaws.com/vagrant/opscode_ubuntu-10.04_chef-11.2.0.box
- require_chef_omnibus: 11.4.0
- run_list:
- - recipe[apt]
-suites:
-- name: default
- run_list:
- - recipe[minitest-handler]
- - recipe[apt_test]
- attributes: {}
-- name: cacher-ng
- run_list:
- - recipe[minitest-handler]
- - recipe[apt_test::cacher-ng]
- attributes: {}
-- name: lwrps
- run_list:
- - recipe[minitest-handler]
- - recipe[apt_test::lwrps]
- attributes: {}
View
@@ -1,8 +0,0 @@
-site :opscode
-
-metadata
-
-group :integration do
- cookbook "minitest-handler"
- cookbook "apt_test", :path => "./test/cookbooks/apt_test"
-end
View
@@ -1,75 +0,0 @@
-## v1.9.0:
-
-* [COOK-2185] - Proxy for apt-key
-* [COOK-2338] - Support pinning by glob() or regexp
-
-## v1.8.4:
-
-* [COOK-2171] - Update README to clarify required Chef version: 10.18.0
- or higher.
-
-## v1.8.2:
-
-* [COOK-2112] - need [] around "arch" in sources.list entries
-* [COOK-2171] - fixes a regression in the notification
-
-## v1.8.0:
-
-* [COOK-2143] - Allow for a custom cacher-ng port
-* [COOK-2171] - On `apt_repository.run_action(:add)` the source file
- is not created.
-* [COOK-2184] - apt::cacher-ng, use `cacher_port` attribute in
- acng.conf
-
-## v1.7.0:
-
-* [COOK-2082] - add "arch" parameter to apt_repository LWRP
-
-## v1.6.0:
-
-* [COOK-1893] - `apt_preference` use "`package_name`" resource instead of "name"
-* [COOK-1894] - change filename for sources.list.d files
-* [COOK-1914] - Wrong dir permissions for /etc/apt/preferences.d/
-* [COOK-1942] - README.md has wrong name for the keyserver attribute
-* [COOK-2019] - create 01proxy before any other apt-get updates get executed
-
-## v1.5.2:
-
-* [COOK-1682] - use template instead of file resource in apt::cacher-client
-* [COOK-1875] - cacher-client should be Environment-aware
-
-## V1.5.0:
-
-* [COOK-1500] - Avoid triggering apt-get update
-* [COOK-1548] - Add execute commands for autoclean and autoremove
-* [COOK-1591] - Setting up the apt proxy should leave https
- connections direct
-* [COOK-1596] - execute[apt-get-update-periodic] never runs
-* [COOK-1762] - create /etc/apt/preferences.d directory
-* [COOK-1776] - apt key check isn't idempotent
-
-## v1.4.8:
-
-* Adds test-kitchen support
-* [COOK-1435] - repository lwrp is not idempotent with http key
-
-## v1.4.6:
-
-* [COOK-1530] - apt_repository isn't aware of update-success-stamp
- file (also reverts COOK-1382 patch).
-
-## v1.4.4:
-
-* [COOK-1229] - Allow cacher IP to be set manually in non-Chef Solo
- environments
-* [COOK-1530] - Immediately update apt-cache when sources.list file is dropped off
-
-## v1.4.2:
-
-* [COOK-1155] - LWRP for apt pinning
-
-## v1.4.0:
-
-* [COOK-889] - overwrite existing repo source files
-* [COOK-921] - optionally use cookbook\_file or remote\_file for key
-* [COOK-1032] - fixes problem with apt repository key installation
View
@@ -1,29 +0,0 @@
-If you would like to contribute, please open a ticket in JIRA:
-
-* http://tickets.opscode.com
-
-Create the ticket in the COOK project and use the cookbook name as the
-component.
-
-For all code contributions, we ask that contributors sign a
-contributor license agreement (CLA). Instructions may be found here:
-
-* http://wiki.opscode.com/display/chef/How+to+Contribute
-
-When contributing changes to individual cookbooks, please do not
-modify the version number in the metadata.rb. Also please do not
-update the CHANGELOG.md for a new version. Not all changes to a
-cookbook may be merged and released in the same versions. Opscode will
-handle the version updates during the release process. You are welcome
-to correct typos or otherwise make updates to documentation in the
-README.
-
-If a contribution adds new platforms or platform versions, indicate
-such in the body of the commit message(s), and update the relevant
-COOK ticket. When writing commit messages, it is helpful for others if
-you indicate the COOK ticket. For example:
-
- git commit -m '[COOK-1041] Updated pool resource to correctly delete.'
-
-In the ticket itself, it is also helpful if you include log output of
-a successful Chef run, but this is not absolutely required.
View
@@ -1,15 +0,0 @@
-source 'https://rubygems.org'
-
-gem 'foodcritic'
-gem 'berkshelf'
-gem 'thor-foodcritic'
-gem 'vagrant', '~> 1.0.6'
-
-group :integration do
- gem 'test-kitchen', :git => "git://github.com/opscode/test-kitchen.git", :branch => '1.0'
- gem 'kitchen-vagrant', :git => "git://github.com/opscode/kitchen-vagrant.git"
-
- # Change .kitchen.yml's driver_plugin to ec2 and populate
- # .kitchen.local.yml's driver_config with aws auth data
- gem 'kitchen-ec2', :git => "git://github.com/opscode/kitchen-ec2.git"
-end
Oops, something went wrong.

0 comments on commit 9d98a33

Please sign in to comment.