Skip to content

Commit

Permalink
Remove Ubuntu 12.04 (#24161)
Browse files Browse the repository at this point in the history
Ubuntu 12.04 will be EOL on April 28, 2017.
  • Loading branch information
tlrx committed Apr 19, 2017
1 parent 741c031 commit e81bbc2
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 8 deletions.
3 changes: 1 addition & 2 deletions TESTING.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -345,7 +345,6 @@ VM running trusty by running

These are the linux flavors the Vagrantfile currently supports:

* ubuntu-1204 aka precise
* ubuntu-1404 aka trusty
* ubuntu-1604 aka xenial
* debian-8 aka jessie, the current debian stable distribution
Expand Down Expand Up @@ -431,7 +430,7 @@ gradle vagrantFedora24#up
-------------------------------------------------

Or any of vagrantCentos6#up, vagrantDebian8#up, vagrantFedora24#up, vagrantOel6#up,
vagrantOel7#up, vagrantOpensuse13#up, vagrantSles12#up, vagrantUbuntu1204#up,
vagrantOel7#up, vagrantOpensuse13#up, vagrantSles12#up, vagrantUbuntu1404#up,
vagrantUbuntu1604#up.

Once up, you can then connect to the VM using SSH from the elasticsearch directory:
Expand Down
4 changes: 0 additions & 4 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,6 @@
# under the License.

Vagrant.configure(2) do |config|
config.vm.define "ubuntu-1204" do |config|
config.vm.box = "elastic/ubuntu-12.04-x86_64"
ubuntu_common config
end
config.vm.define "ubuntu-1404" do |config|
config.vm.box = "elastic/ubuntu-14.04-x86_64"
ubuntu_common config
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ class VagrantTestPlugin implements Plugin<Project> {
'oel-7',
'opensuse-13',
'sles-12',
'ubuntu-1204',
'ubuntu-1404',
'ubuntu-1604'
]
Expand Down
2 changes: 1 addition & 1 deletion docs/plugins/discovery-azure-classic.asciidoc
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ Before starting, you need to have:
* A http://www.windowsazure.com/[Windows Azure account]
* OpenSSL that isn't from MacPorts, specifically `OpenSSL 1.0.1f 6 Jan
2014` doesn't seem to create a valid keypair for ssh. FWIW,
`OpenSSL 1.0.1c 10 May 2012` on Ubuntu 12.04 LTS is known to work.
`OpenSSL 1.0.1c 10 May 2012` on Ubuntu 14.04 LTS is known to work.
* SSH keys and certificate
+
--
Expand Down

0 comments on commit e81bbc2

Please sign in to comment.