diff --git a/.gitignore b/.gitignore index 551a561..ef6adbc 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,3 @@ test/tmp test/version_tmp tmp .vagrant -development/cookbooks diff --git a/Gemfile b/Gemfile index e450def..ca41ca7 100644 --- a/Gemfile +++ b/Gemfile @@ -10,6 +10,5 @@ group :plugins do gem 'vagrant-lxc', github: 'fgrehm/vagrant-lxc' gem 'vagrant-pristine', github: 'fgrehm/vagrant-pristine' gem 'vagrant-global-status', github: 'fgrehm/vagrant-global-status' - gem 'vagrant-librarian-chef' gem 'vagrant-omnibus' end diff --git a/Gemfile.lock b/Gemfile.lock index bb2b9b7..2e4a1b6 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -41,106 +41,30 @@ PATH GEM remote: https://rubygems.org/ specs: - archive-tar-minitar (0.5.2) celluloid (0.15.2) timers (~> 1.1.0) - chef (11.10.4) - chef-zero (~> 1.7, >= 1.7.2) - diff-lcs (~> 1.2, >= 1.2.4) - erubis (~> 2.7) - highline (~> 1.6, >= 1.6.9) - json (>= 1.4.4, <= 1.8.1) - mime-types (~> 1.16) - mixlib-authentication (~> 1.3) - mixlib-cli (~> 1.4) - mixlib-config (~> 2.0) - mixlib-log (~> 1.3) - mixlib-shellout (~> 1.3) - net-ssh (~> 2.6) - net-ssh-multi (~> 1.1) - ohai (~> 6.0) - pry (~> 0.9) - puma (~> 1.6) - rest-client (>= 1.0.4, < 1.7.0) - yajl-ruby (~> 1.1) - chef-zero (1.7.3) - hashie (~> 2.0) - json - mixlib-log (~> 1.3) - moneta (< 0.7.0) - rack childprocess (0.5.2) ffi (~> 1.0, >= 1.0.11) - coderay (1.1.0) - diff-lcs (1.2.5) erubis (2.7.0) ffi (1.9.3) - hashie (2.1.0) - highline (1.6.21) i18n (0.6.9) - ipaddress (0.8.0) - json (1.8.1) - librarian (0.1.2) - highline - thor (~> 0.15) - librarian-chef (0.0.2) - archive-tar-minitar (>= 0.5.2) - chef (>= 0.10) - librarian (~> 0.1.0) listen (2.4.1) celluloid (>= 0.15.2) rb-fsevent (>= 0.9.3) rb-inotify (>= 0.9) log4r (1.1.10) - method_source (0.8.2) - mime-types (1.25.1) - mixlib-authentication (1.3.0) - mixlib-log - mixlib-cli (1.4.0) - mixlib-config (2.1.0) - mixlib-log (1.6.0) - mixlib-shellout (1.3.0) - moneta (0.6.0) net-scp (1.1.2) net-ssh (>= 2.6.5) net-ssh (2.7.0) - net-ssh-gateway (1.2.0) - net-ssh (>= 2.6.5) - net-ssh-multi (1.2.0) - net-ssh (>= 2.6.5) - net-ssh-gateway (>= 1.2.0) - ohai (6.20.0) - ipaddress - mixlib-cli - mixlib-config - mixlib-log - mixlib-shellout - systemu (~> 2.5.2) - yajl-ruby - pry (0.9.12.6) - coderay (~> 1.0) - method_source (~> 0.8) - slop (~> 3.4) - puma (1.6.3) - rack (~> 1.2) - rack (1.5.2) rake (10.2.2) rb-fsevent (0.9.4) rb-inotify (0.9.3) ffi (>= 0.5.0) rb-kqueue (0.2.2) ffi (>= 0.5.0) - rest-client (1.6.7) - mime-types (>= 1.16) - slop (3.5.0) - systemu (2.5.2) - thor (0.19.1) timers (1.1.0) - vagrant-librarian-chef (0.1.5) - librarian-chef vagrant-omnibus (1.3.1) wdm (0.1.0) - yajl-ruby (1.2.0) PLATFORMS ruby @@ -150,7 +74,6 @@ DEPENDENCIES vagrant! vagrant-cachier! vagrant-global-status! - vagrant-librarian-chef vagrant-lxc! vagrant-omnibus vagrant-pristine! diff --git a/development/Vagrantfile b/development/Vagrantfile index f51bedd..6bb3a06 100644 --- a/development/Vagrantfile +++ b/development/Vagrantfile @@ -71,14 +71,7 @@ Vagrant.configure("2") do |config| ubuntu.omnibus.chef_version = :latest ubuntu.vm.provision :chef_solo do |chef| - chef.add_recipe "java::oracle" - chef.json = { - :java => { - :oracle => { - :accept_oracle_download_terms => true - } - } - } + chef.add_recipe "cachier::default" end end diff --git a/development/cookbooks/cachier/recipes/default.rb b/development/cookbooks/cachier/recipes/default.rb new file mode 100644 index 0000000..d88939c --- /dev/null +++ b/development/cookbooks/cachier/recipes/default.rb @@ -0,0 +1,4 @@ +zip_filepath = "#{Chef::Config['file_cache_path']}/vagrant-cachier.zip" +zip_url = "https://github.com/fgrehm/vagrant-cachier/archive/master.zip" + +remote_file(zip_filepath) { source zip_url }