Merge pull request #6719 from litian54/master

Fix Rendering SLS 'base:nginx' failed if 'cloud' is not defined in minio...

Merge pull request #6719 from litian54/master
67169ec8 · Dawn Chen · 29e4d6c9 · 36ef7862 · 67169ec8
Commit 67169ec8 authored Apr 13, 2015 by Dawn Chen
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

init.sls cluster/saltbase/salt/nginx/init.sls +1 -1

No files found.
--- a/cluster/saltbase/salt/nginx/init.sls
+++ b/cluster/saltbase/salt/nginx/init.sls
@@ -28,7 +28,7 @@ nginx:
    - group: root
    - mode: 644

-{% if grains.cloud in ['gce'] %}
+{% if grains.cloud is defined and grains.cloud in ['gce'] %}
 /etc/kubernetes/manifests/nginx.json:
  file:
    - managed