From 0dff1888e23bb412f102870c17ad51e33b20b931 Mon Sep 17 00:00:00 2001
From: Lavar Askew <open.hyperion@gmail.com>
Date: Thu, 22 Nov 2018 06:03:52 -0800
Subject: [PATCH] Vagrant: Remove private network DHCP setup for all Ubuntu
 distros.

Private network DHCP would put the wrong nameserver in the /etc/resolv.conf
file.  This would break apt-get or anything that needed network access.
Removing that line from the Vagrantfile caused this to work.

Change-Id: I66dab9ddf72018a8e39e8e24d0b8175173ddb8f1
Signed-off-by: Lavar Askew <open.hyperion@gmail.com>
Reviewed-on: https://review.gerrithub.io/c/434392
Tested-by: SPDK CI Jenkins <sys_sgci@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
Reviewed-by: Vitaliy Mysak <vitaliy.mysak@intel.com>
Reviewed-by: Darek Stojaczyk <dariusz.stojaczyk@intel.com>
Reviewed-by: Karol Latecki <karol.latecki@intel.com>
---
 scripts/vagrant/Vagrantfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/vagrant/Vagrantfile b/scripts/vagrant/Vagrantfile
index cab75b34a..4e4183e71 100644
--- a/scripts/vagrant/Vagrantfile
+++ b/scripts/vagrant/Vagrantfile
@@ -78,7 +78,9 @@ Vagrant.configure(2) do |config|
     config.cache.scope = :box
   end
 
-  config.vm.network "private_network", type: "dhcp"
+  if !(distro.include?("ubuntu"))
+    config.vm.network "private_network", type: "dhcp"
+  end
 
   # use http proxy if avaiable
   if ENV['http_proxy'] && Vagrant.has_plugin?("vagrant-proxyconf")