From 82ae21853a82f27855d80dd38eeed44997dedbc0 Mon Sep 17 00:00:00 2001
From: Andrew Kroh <andrew.kroh@elastic.co>
Date: Mon, 21 May 2018 19:09:23 -0400
Subject: [PATCH 1/2] Add more Vagrant machines

This adds a few Linux distros to the Vagrantfile for convenient testing.

- Ubuntu1804
- ArchLinux
- SLES12
- Centos6
- Fedora26 -> 27 (update)
---
 Vagrantfile | 48 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index 3e0f2b2c731a..af2cbaa18923 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -145,8 +145,19 @@ Vagrant.configure(2) do |config|
     c.vm.synced_folder ".", "/vagrant", type: "virtualbox"
   end
 
-  config.vm.define "fedora26", primary: true do |c|
-    c.vm.box = "bento/fedora-26"
+  config.vm.define "centos6", primary: true do |c|
+    c.vm.box = "bento/centos-6.9"
+    c.vm.network :forwarded_port, guest: 22,   host: 2229,  id: "ssh", auto_correct: true
+
+    #c.vm.provision "shell", inline: $unixProvision, privileged: false
+    #c.vm.provision "shell", inline: $linuxGvmProvision, privileged: false
+    c.vm.provision "shell", inline: "yum install -y make gcc python-pip python-virtualenv git"
+
+    c.vm.synced_folder ".", "/vagrant", type: "virtualbox"
+  end
+
+  config.vm.define "fedora27", primary: true do |c|
+    c.vm.box = "bento/fedora-27"
     c.vm.network :forwarded_port, guest: 22,   host: 2227,  id: "ssh", auto_correct: true
 
     c.vm.provision "shell", inline: $unixProvision, privileged: false
@@ -156,6 +167,39 @@ Vagrant.configure(2) do |config|
     c.vm.synced_folder ".", "/vagrant", type: "virtualbox"
   end
 
+  config.vm.define "archlinux", primary: true do |c|
+    c.vm.box = "archlinux/archlinux"
+    c.vm.network :forwarded_port, guest: 22,   host: 2228,  id: "ssh", auto_correct: true
+
+    c.vm.provision "shell", inline: $unixProvision, privileged: false
+    c.vm.provision "shell", inline: $linuxGvmProvision, privileged: false
+    c.vm.provision "shell", inline: "pacman -Sy && pacman -S --noconfirm make gcc python-pip python-virtualenv git"
+
+    c.vm.synced_folder ".", "/vagrant", type: "virtualbox"
+  end
+
+  config.vm.define "ubuntu1804", primary: true do |c|
+    c.vm.box = "ubuntu/bionic64"
+    c.vm.network :forwarded_port, guest: 22,   host: 2229,  id: "ssh", auto_correct: true
+
+    c.vm.provision "shell", inline: $unixProvision, privileged: false
+    c.vm.provision "shell", inline: $linuxGvmProvision, privileged: false
+    c.vm.provision "shell", inline: "apt-get update && apt-get install -y make gcc python-pip python-virtualenv git"
+
+    c.vm.synced_folder ".", "/vagrant", type: "virtualbox"
+  end
+
+  config.vm.define "sles12", primary: true do |c|
+    c.vm.box = "elastic/sles-12-x86_64"
+    c.vm.network :forwarded_port, guest: 22,   host: 2230,  id: "ssh", auto_correct: true
+
+    c.vm.provision "shell", inline: $unixProvision, privileged: false
+    c.vm.provision "shell", inline: $linuxGvmProvision, privileged: false
+    c.vm.provision "shell", inline: "pip install virtualenv"
+
+    c.vm.synced_folder ".", "/vagrant", type: "virtualbox"
+  end
+
 end
 
 # -*- mode: ruby -*-

From 596d09c51bc80b48a43169241c567667ef967132 Mon Sep 17 00:00:00 2001
From: Andrew Kroh <andrew.kroh@elastic.co>
Date: Tue, 22 May 2018 15:30:17 -0400
Subject: [PATCH 2/2] Uncomment Centos6 provisioning

---
 Vagrantfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index af2cbaa18923..2d5cae6b7931 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -149,8 +149,8 @@ Vagrant.configure(2) do |config|
     c.vm.box = "bento/centos-6.9"
     c.vm.network :forwarded_port, guest: 22,   host: 2229,  id: "ssh", auto_correct: true
 
-    #c.vm.provision "shell", inline: $unixProvision, privileged: false
-    #c.vm.provision "shell", inline: $linuxGvmProvision, privileged: false
+    c.vm.provision "shell", inline: $unixProvision, privileged: false
+    c.vm.provision "shell", inline: $linuxGvmProvision, privileged: false
     c.vm.provision "shell", inline: "yum install -y make gcc python-pip python-virtualenv git"
 
     c.vm.synced_folder ".", "/vagrant", type: "virtualbox"