From 0d89db514141ff4449fd2d59d73cce770c450cf0 Mon Sep 17 00:00:00 2001 From: Giacomo Longo Date: Mon, 8 Oct 2018 12:40:20 +0200 Subject: [PATCH] Split Vagrantfile Ubuntu versions into 1604 and 1804 (#3440) Split Vagrantfile Ubuntu versions into 1604 and 1804 (#3440) --- Vagrantfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 209d97580..5e690cfff 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -16,7 +16,8 @@ SUPPORTED_OS = { "coreos-stable" => {box: "coreos-stable", bootstrap_os: "coreos", user: "core", box_url: COREOS_URL_TEMPLATE % ["stable"]}, "coreos-alpha" => {box: "coreos-alpha", bootstrap_os: "coreos", user: "core", box_url: COREOS_URL_TEMPLATE % ["alpha"]}, "coreos-beta" => {box: "coreos-beta", bootstrap_os: "coreos", user: "core", box_url: COREOS_URL_TEMPLATE % ["beta"]}, - "ubuntu" => {box: "bento/ubuntu-16.04", bootstrap_os: "ubuntu", user: "vagrant"}, + "ubuntu1604" => {box: "generic/ubuntu1604", bootstrap_os: "ubuntu", user: "vagrant"}, + "ubuntu1804" => {box: "generic/ubuntu1804", bootstrap_os: "ubuntu", user: "vagrant"}, "centos" => {box: "centos/7", bootstrap_os: "centos", user: "vagrant"}, "fedora" => {box: "fedora/28-cloud-base", bootstrap_os: "fedora", user: "vagrant"}, "opensuse" => {box: "opensuse/openSUSE-42.3-x86_64", bootstrap_os: "opensuse", use: "vagrant"}, @@ -32,7 +33,7 @@ $vm_cpus = 1 $shared_folders = {} $forwarded_ports = {} $subnet = "172.17.8" -$os = "ubuntu" +$os = "ubuntu1804" $network_plugin = "flannel" # The first three nodes are etcd servers $etcd_instances = $num_instances