From 479f4128db25ddce713eb1700b999a643ec55f33 Mon Sep 17 00:00:00 2001
From: Alexander Trost <galexrt@googlemail.com>
Date: Wed, 1 Apr 2020 12:28:57 +0200
Subject: [PATCH] vagrant: remove pre variables file

Removed pre variables file from ubuntu.
Closes #63.

Signed-off-by: Alexander Trost <galexrt@googlemail.com>
---
 vagrantfiles/Vagrantfile      |  3 ---
 vagrantfiles/Vagrantfile_vars |  2 +-
 vagrantfiles/ubuntu/common    | 24 ++++++++++++++++++++++++
 vagrantfiles/ubuntu/pre       | 23 -----------------------
 4 files changed, 25 insertions(+), 27 deletions(-)
 delete mode 100644 vagrantfiles/ubuntu/pre

diff --git a/vagrantfiles/Vagrantfile b/vagrantfiles/Vagrantfile
index 8e8d2b6..0990af9 100644
--- a/vagrantfiles/Vagrantfile
+++ b/vagrantfiles/Vagrantfile
@@ -9,9 +9,6 @@ VAGRANT_DEFAULT_PROVIDER = ENV['VAGRANT_DEFAULT_PROVIDER'] || 'virtualbox'.freez
 # Vagrantfile OS set to use
 BOX_OS = ENV['BOX_OS'] || 'fedora'.freeze
 
-$osprefile = File.expand_path("../#{BOX_OS}/pre", __FILE__)
-load $osprefile if File.exist?($osprefile)
-
 # Load the Vagrantfile_vars file
 $vagrantfilecommon = File.expand_path('../Vagrantfile_vars', __FILE__)
 load $vagrantfilecommon
diff --git a/vagrantfiles/Vagrantfile_vars b/vagrantfiles/Vagrantfile_vars
index 568c6d6..9dcdb57 100644
--- a/vagrantfiles/Vagrantfile_vars
+++ b/vagrantfiles/Vagrantfile_vars
@@ -60,7 +60,7 @@ $storagecontroller = 'k8svmSATAController'
 $storagecontrollerneedstobecreated = true
 
 # Common scripts
-$osPrepareScript = ""
+$osPrepareScript = "echo OS PREPARE SCRIPT EMPTY."
 
 $prepareScript = <<SCRIPT
 set -x
diff --git a/vagrantfiles/ubuntu/common b/vagrantfiles/ubuntu/common
index 5c9f014..5c5f5a8 100644
--- a/vagrantfiles/ubuntu/common
+++ b/vagrantfiles/ubuntu/common
@@ -4,6 +4,26 @@ if $kubernetes_pkg_version_suffix == ''
     $kubernetes_pkg_version_suffix = '-00'
 end
 
+$osPrepareScript = <<SCRIPT
+set -x
+
+sed -i 's/^DNS=.*/DNS=8.8.8.8 8.8.4.4/' /etc/systemd/resolved.conf
+
+sudo update-alternatives --set iptables /usr/sbin/iptables-legacy
+sudo update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
+sudo update-alternatives --set arptables /usr/sbin/arptables-legacy
+sudo update-alternatives --set ebtables /usr/sbin/ebtables-legacy
+
+retries=5
+for ((i=1; i<=retries; i++)); do
+    apt-get update
+    apt-get -y install apt-transport-https curl software-properties-common ca-certificates && \
+        break
+
+    [[ $retries -eq i ]] && { echo "Failed to install apt-transport-https and other dependenices after 5 tries"; exit 1; }
+done
+SCRIPT
+
 $docker_version = '5:18.09.1~3-0~ubuntu-bionic'
 
 $containerRuntimeInstallScript = <<SCRIPT
@@ -24,3 +44,7 @@ for ((i=1; i<=retries; i++)); do
     [[ $retries -eq i ]] && { echo "Failed to install docker-ce after 5 tries"; exit 1; }
 done
 SCRIPT
+
+$kubeletExtraArgsFile = '/etc/default/kubelet'
+
+$kube_network = 'canal'
diff --git a/vagrantfiles/ubuntu/pre b/vagrantfiles/ubuntu/pre
deleted file mode 100644
index 270963c..0000000
--- a/vagrantfiles/ubuntu/pre
+++ /dev/null
@@ -1,23 +0,0 @@
-$kube_network = 'canal'
-
-$osPrepareScript = <<SCRIPT
-set -x
-
-sed -i 's/^DNS=.*/DNS=8.8.8.8 8.8.4.4/' /etc/systemd/resolved.conf
-
-sudo update-alternatives --set iptables /usr/sbin/iptables-legacy
-sudo update-alternatives --set ip6tables /usr/sbin/ip6tables-legacy
-sudo update-alternatives --set arptables /usr/sbin/arptables-legacy
-sudo update-alternatives --set ebtables /usr/sbin/ebtables-legacy
-
-retries=5
-for ((i=1; i<=retries; i++)); do
-    apt-get update
-    apt-get -y install apt-transport-https curl software-properties-common ca-certificates && \
-        break
-
-    [[ $retries -eq i ]] && { echo "Failed to install apt-transport-https and other dependenices after 5 tries"; exit 1; }
-done
-SCRIPT
-
-$kubeletExtraArgsFile = '/etc/default/kubelet'