Skip to content

Commit

Permalink
Update to Ubuntu Xenial.
Browse files Browse the repository at this point in the history
  • Loading branch information
Eberhard Wolff committed Sep 4, 2017
1 parent 7230754 commit 33bef24
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 74 deletions.
3 changes: 1 addition & 2 deletions chef/Vagrantfile
@@ -1,6 +1,5 @@
Vagrant.configure(2) do |config|
config.vm.box = "vivid"
config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/vivid/current/vivid-server-cloudimg-amd64-vagrant-disk1.box"
config.vm.box = "ubuntu/xenial64"

config.vm.network "forwarded_port", guest: 8080, host: 18080
config.vm.network "forwarded_port", guest: 8081, host: 18081
Expand Down
64 changes: 1 addition & 63 deletions chef/cookbooks/java/metadata.json
Expand Up @@ -19,69 +19,7 @@
},
"suggestions": {
},
"long_description": "Description
===========

Installs a Java. Uses OpenJDK.

Requirements
============

Platform:

* Ubuntu (OpenJDK)

The following Opscode cookbooks are dependencies:

* apt


Usage
=====

Simply include the recipe where you want Java installed.

If you would like to use the Sun flavor of Java, create a role and set the `java[install_flavor]` attribute to `'sun'`.

% knife role show java
{
\"name\": \"java\",
\"chef_type\": \"role\",
\"json_class\": \"Chef::Role\",
\"default_attributes\": {
\"java\": {
\"install_flavor\":\"sun\"
}
},
\"description\": \"\",
\"run_list\": [
\"recipe[java]\"
],
\"override_attributes\": {
}
}


License and Author
==================

Author:: Seth Chisamore (<schisamo@opscode.com>)
Eberhard Wolff

Copyright:: 2008-2010, Opscode, Inc

Licensed under the Apache License, Version 2.0 (the \"License\");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an \"AS IS\" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
",
"long_description": "Installs Java. Uses OpenJDK. Author:: Seth Chisamore (<schisamo@opscode.com>) Copyright:: 2008-2010, Opscode, Inc Licensed under the Apache License, Version 2.0 (the \"License\");",
"platforms": {
"ubuntu": [

Expand Down
3 changes: 1 addition & 2 deletions docker/Vagrantfile
@@ -1,6 +1,5 @@
Vagrant.configure("2") do |config|
config.vm.box = "vivid"
config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/vivid/current/vivid-server-cloudimg-amd64-vagrant-disk1.box"
config.vm.box = "ubuntu/xenial64"
config.vm.synced_folder "log", "/log", create: true
config.vm.network "forwarded_port", guest: 8080, host: 8090

Expand Down
3 changes: 1 addition & 2 deletions graphite/Vagrantfile
@@ -1,6 +1,5 @@
Vagrant.configure("2") do |config|
config.vm.box = "vivid"
config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/vivid/current/vivid-server-cloudimg-amd64-vagrant-disk1.box"
config.vm.box = "ubuntu/xenial64"
config.vm.network "forwarded_port", guest: 8082, host: 8082
config.vm.network "forwarded_port", guest: 8083, host: 8083
config.vm.network "forwarded_port", guest: 2003, host: 2003
Expand Down
3 changes: 1 addition & 2 deletions log-analysis/Vagrantfile
@@ -1,6 +1,5 @@
Vagrant.configure("2") do |config|
config.vm.box = "vivid"
config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/vivid/current/vivid-server-cloudimg-amd64-vagrant-disk1.box"
config.vm.box = "ubuntu/xenial64"
config.vm.synced_folder "../user-registration-application/target", "/target", create: true
config.vm.network "forwarded_port", guest: 8080, host: 8080
config.vm.network "forwarded_port", guest: 5601, host: 5601
Expand Down
5 changes: 2 additions & 3 deletions shell/Vagrantfile
@@ -1,7 +1,6 @@
Vagrant.configure(2) do |config|
config.vm.box = "vivid"
config.vm.box_url = "https://cloud-images.ubuntu.com/vagrant/vivid/current/vivid-server-cloudimg-amd64-vagrant-disk1.box"

config.vm.box = "ubuntu/xenial64"

config.vm.network "forwarded_port", guest: 8080, host: 18080
config.vm.network "forwarded_port", guest: 8081, host: 18081

Expand Down

0 comments on commit 33bef24

Please sign in to comment.