Commit 67814413 authored by Tim Hockin's avatar Tim Hockin

Merge pull request #6883 from litian54/dev

Fix Jinja render bug if 'portal_net' or 'cluster_name' is undefined
parents 835a87ae b5e41112
......@@ -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 -%}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment