github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #6883 from litian54/dev 

Fix Jinja render bug if 'portal_net' or 'cluster_name' is undefined
pull/6/head
Tim Hockin 2015-04-15 17:25:53 -07:00
parent 835a87aed2 b5e4111234
commit 6781441307
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/kube-apiserver/kube-apiserver.manifest
View File

@ -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 -%}