From 46e6df655f496b2741909779220f55891a7f79a7 Mon Sep 17 00:00:00 2001
From: Matt Johnson <matjohn2@cisco.com>
Date: Tue, 29 Mar 2016 19:24:03 +0100
Subject: [PATCH] Support use of NETWORK_PROVIDER=cni with
 KUBERNETES_PROVIDER=vagrant for a kube-up. Use of NETWORK_PROVIDER=cni is
 documented as useable (as well as it's affects on the runtime args of
 kubelet), however the actual implimentation in the salt automation doesnt
 seem to exist. this change attempts to fix that for the vagrant usecase.

---
 cluster/saltbase/salt/docker/docker-defaults | 3 +++
 cluster/saltbase/salt/kubelet/default        | 2 ++
 cluster/saltbase/salt/top.sls                | 4 ++++
 3 files changed, 9 insertions(+)

diff --git a/cluster/saltbase/salt/docker/docker-defaults b/cluster/saltbase/salt/docker/docker-defaults
index 2eee8d74b1e..260791cf18f 100644
--- a/cluster/saltbase/salt/docker/docker-defaults
+++ b/cluster/saltbase/salt/docker/docker-defaults
@@ -7,6 +7,9 @@
 {% if pillar.get('network_provider', '').lower() == 'kubenet' %}
   {% set bridge_opts = "" %}
 {% endif -%}
+{% if pillar.get('network_provider', '').lower() == 'cni' %}
+  {% set bridge_opts = "" %}
+{% endif -%}
 {% set log_level = "--log-level=warn" -%}
 {% if pillar['docker_test_log_level'] is defined -%}
   {% set log_level = pillar['docker_test_log_level'] -%}
diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default
index 0aa2ac5e4f9..a13278b60cc 100644
--- a/cluster/saltbase/salt/kubelet/default
+++ b/cluster/saltbase/salt/kubelet/default
@@ -144,6 +144,8 @@
 {% set network_plugin = "" -%}
 {% if pillar.get('network_provider', '').lower() == 'opencontrail' %}
   {% set network_plugin = "--network-plugin=opencontrail" %}
+{% elif pillar.get('network_provider', '').lower() == 'cni' %}
+  {% set network_plugin = "--network-plugin=cni --network-plugin-dir=/etc/cni/net.d/" %}
 {% elif pillar.get('network_provider', '').lower() == 'kubenet' %}
   {% set network_plugin = "--network-plugin=kubenet" -%}
   {% if reconcile_cidr_args == '' -%}
diff --git a/cluster/saltbase/salt/top.sls b/cluster/saltbase/salt/top.sls
index f1fd943c74d..e6a2bce62fa 100644
--- a/cluster/saltbase/salt/top.sls
+++ b/cluster/saltbase/salt/top.sls
@@ -17,6 +17,8 @@ base:
     - flannel
 {% elif pillar.get('network_provider', '').lower() == 'kubenet' %}
     - cni
+{% elif pillar.get('network_provider', '').lower() == 'cni' %}
+    - cni
 {% endif %}
     - helpers
     - kube-client-tools
@@ -49,6 +51,8 @@ base:
     - flannel
 {% elif pillar.get('network_provider', '').lower() == 'kubenet' %}
     - cni
+{% elif pillar.get('network_provider', '').lower() == 'cni' %}
+    - cni
 {% endif %}
     - kube-apiserver
     - kube-controller-manager