From f2ae2a029493de8e73a8167098ce2dde93f5225a Mon Sep 17 00:00:00 2001
From: John Dewey <john@dewey.ws>
Date: Tue, 28 Feb 2017 13:31:28 -0800
Subject: [PATCH] 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.
---
 Vagrantfile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/Vagrantfile b/Vagrantfile
index a068eeabf..8d3f2bbdd 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -94,12 +94,14 @@ Vagrant.configure("2") do |config|
 
       ip = "#{$subnet}.#{i+100}"
       host_vars[vm_name] = {
-        "ip" => ip,
-        #"access_ip" => ip,
-        "flannel_interface" => ip,
-        "flannel_backend_type" => "host-gw",
-        "local_release_dir" => "/vagrant/temp",
-        "download_run_once" => "False"
+        "ip": ip,
+        "flannel_interface": ip,
+        "flannel_backend_type": "host-gw",
+        "local_release_dir": "/vagrant/temp",
+        "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