From b5e41112344c2cf9b4603c230a80d4c0537a5727 Mon Sep 17 00:00:00 2001
From: litian54 <tianli8954@gmail.com>
Date: Wed, 15 Apr 2015 17:15:12 -0700
Subject: [PATCH] Fix Jinja render bug if 'portal_net' or 'cluster_name' is
 undefined

---
 cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest b/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
index f1032efab65..6c4804d6ca3 100644
--- a/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
+++ b/cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
@@ -24,6 +24,7 @@
 
 {% set address = "--address=127.0.0.1" -%}
 
+{% set cluster_name = "" -%}
 {% if pillar['instance_prefix'] is defined -%}
   {% set cluster_name = "--cluster_name=" + pillar['instance_prefix'] -%}
 {% endif -%}
@@ -35,6 +36,7 @@
 
 {% set etcd_servers = "--etcd_servers=http://127.0.0.1:4001" -%}
 
+{% set portal_net = "" -%}
 {% if pillar['portal_net'] is defined -%}
   {% set portal_net = "--portal_net=" + pillar['portal_net'] -%}
 {% endif -%}