Ensure vagrant uses flannel

The Vagrantfile is setup to use flannel.  The default network
was changed to Calico (#1031).  However, the Vagrantfile was
not updated to reflect this.  Ensuring the Vagrantfile remains
functional on master, until someone decides to make it work
with Calico.
pull/1094/head
John Dewey 2017-02-28 13:31:28 -08:00
parent 21d3d75827
commit f877278075
No known key found for this signature in database
GPG Key ID: 85CA6C7BD56CF2EB
1 changed files with 8 additions and 6 deletions

14
Vagrantfile vendored
View File

@ -94,12 +94,14 @@ Vagrant.configure("2") do |config|
ip = "#{$subnet}.#{i+100}" ip = "#{$subnet}.#{i+100}"
host_vars[vm_name] = { host_vars[vm_name] = {
"ip" => ip, "ip": ip,
#"access_ip" => ip, "flannel_interface": ip,
"flannel_interface" => ip, "flannel_backend_type": "host-gw",
"flannel_backend_type" => "host-gw", "local_release_dir": "/vagrant/temp",
"local_release_dir" => "/vagrant/temp", "download_run_once": "False",
"download_run_once" => "False" # Override the default 'calico' with flannel.
# inventory/group_vars/k8s-cluster.yml
"kube_network_plugin": "flannel",
} }
config.vm.network :private_network, ip: ip config.vm.network :private_network, ip: ip