From a0ae1d90ba94f98ed709fa1f36640583ddb47605 Mon Sep 17 00:00:00 2001
From: Justin Santa Barbara <justin@fathomdb.com>
Date: Thu, 25 Jun 2015 09:17:00 -0400
Subject: [PATCH] Salt: don't assume that master => cbr-cidr

In particular, this is required for vagrant
---
 cluster/saltbase/salt/kubelet/default | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cluster/saltbase/salt/kubelet/default b/cluster/saltbase/salt/kubelet/default
index bac36ad6cdb..40c3d2b9893 100644
--- a/cluster/saltbase/salt/kubelet/default
+++ b/cluster/saltbase/salt/kubelet/default
@@ -77,7 +77,7 @@
 {% endif -%}
 
 {% set pod_cidr = "" %}
-{% if grains['roles'][0] == 'kubernetes-master' %}
+{% if grains['roles'][0] == 'kubernetes-master' and grains.get('cbr-cidr') %}
   {% set pod_cidr = "--pod-cidr=" + grains['cbr-cidr'] %}
 {% endif %}