diff --git a/.gitignore b/.gitignore index ef6adbc..551a561 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ test/tmp test/version_tmp tmp .vagrant +development/cookbooks diff --git a/Gemfile b/Gemfile index 4c761c5..fc3f662 100644 --- a/Gemfile +++ b/Gemfile @@ -4,8 +4,10 @@ source 'https://rubygems.org' gemspec group :development do - gem 'vagrant', github: 'mitchellh/vagrant' + gem 'vagrant', github: 'mitchellh/vagrant', ref: 'v1.2.4' + gem 'vagrant-librarian-chef' gem 'vagrant-lxc', github: 'fgrehm/vagrant-lxc' + gem 'vagrant-omnibus' gem 'vagrant-pristine', github: 'fgrehm/vagrant-pristine' gem 'rake' end diff --git a/Gemfile.lock b/Gemfile.lock index 2bb6df1..30e3966 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -12,9 +12,10 @@ GIT GIT remote: git://github.com/mitchellh/vagrant.git - revision: cf0e302e34f3def9d5405bb14847b4b0cb67de01 + revision: 0219bb87725aac28a97c0e924c310cc97831fd9d + ref: v1.2.4 specs: - vagrant (1.2.5.dev) + vagrant (1.2.4) childprocess (~> 0.3.7) erubis (~> 2.7.0) i18n (~> 0.6.0) @@ -30,16 +31,69 @@ PATH GEM remote: https://rubygems.org/ specs: + archive-tar-minitar (0.5.2) + chef (11.4.4) + erubis + highline (>= 1.6.9) + json (>= 1.4.4, <= 1.7.7) + mixlib-authentication (>= 1.3.0) + mixlib-cli (~> 1.3.0) + mixlib-config (>= 1.1.2) + mixlib-log (>= 1.3.0) + mixlib-shellout + net-ssh (~> 2.6) + net-ssh-multi (~> 1.1.0) + ohai (>= 0.6.0) + rest-client (>= 1.0.4, < 1.7.0) + yajl-ruby (~> 1.1) childprocess (0.3.9) ffi (~> 1.0, >= 1.0.11) erubis (2.7.0) ffi (1.9.0) + highline (1.6.19) i18n (0.6.4) + ipaddress (0.8.0) + json (1.7.7) + librarian (0.1.0) + highline + thor (~> 0.15) + librarian-chef (0.0.1) + archive-tar-minitar (>= 0.5.2) + chef (>= 0.10) + librarian (~> 0.1.0) log4r (1.1.10) + mime-types (1.23) + mixlib-authentication (1.3.0) + mixlib-log + mixlib-cli (1.3.0) + mixlib-config (1.1.2) + mixlib-log (1.6.0) + mixlib-shellout (1.2.0) net-scp (1.1.2) net-ssh (>= 2.6.5) net-ssh (2.6.8) + net-ssh-gateway (1.2.0) + net-ssh (>= 2.6.5) + net-ssh-multi (1.1) + net-ssh (>= 2.1.4) + net-ssh-gateway (>= 0.99.0) + ohai (6.18.0) + ipaddress + mixlib-cli + mixlib-config + mixlib-log + mixlib-shellout + systemu + yajl-ruby rake (10.1.0) + rest-client (1.6.7) + mime-types (>= 1.16) + systemu (2.5.2) + thor (0.18.1) + vagrant-librarian-chef (0.1.2) + librarian-chef + vagrant-omnibus (1.1.0) + yajl-ruby (1.1.0) PLATFORMS ruby @@ -48,5 +102,7 @@ DEPENDENCIES rake vagrant! vagrant-cachier! + vagrant-librarian-chef vagrant-lxc! + vagrant-omnibus vagrant-pristine! diff --git a/development/Cheffile b/development/Cheffile new file mode 100644 index 0000000..bce107c --- /dev/null +++ b/development/Cheffile @@ -0,0 +1,6 @@ +#!/usr/bin/env ruby +#^syntax detection + +site 'http://community.opscode.com/api/v1' + +cookbook 'java' diff --git a/development/Cheffile.lock b/development/Cheffile.lock new file mode 100644 index 0000000..27492b3 --- /dev/null +++ b/development/Cheffile.lock @@ -0,0 +1,12 @@ +SITE + remote: http://community.opscode.com/api/v1 + specs: + chef_handler (1.1.4) + java (1.12.0) + windows (>= 0.0.0) + windows (1.10.0) + chef_handler (>= 0.0.0) + +DEPENDENCIES + java (>= 0) + diff --git a/development/Vagrantfile b/development/Vagrantfile index 3521de3..68c852d 100644 --- a/development/Vagrantfile +++ b/development/Vagrantfile @@ -2,7 +2,9 @@ # vi: set ft=ruby : Vagrant.require_plugin 'vagrant-cachier' +Vagrant.require_plugin 'vagrant-librarian-chef' Vagrant.require_plugin 'vagrant-lxc' +Vagrant.require_plugin 'vagrant-omnibus' Vagrant.require_plugin 'vagrant-pristine' Vagrant.configure("2") do |config| @@ -16,6 +18,18 @@ Vagrant.configure("2") do |config| vb.vm.network :private_network, ip: "192.168.50.123" end + config.omnibus.chef_version = :latest + config.vm.provision :chef_solo do |chef| + chef.add_recipe "java::oracle" + chef.json = { + :java => { + :oracle => { + :accept_oracle_download_terms => true + } + } + } + end + debian_like_configs = lambda do |debian| debian.vm.provision :shell, inline: ' if ! (which bundle > /dev/null); then