Merge pull request #6719 from litian54/master

Fix Rendering SLS 'base:nginx' failed if 'cloud' is not defined in minio...
2015-04-13 10:42:48 -07:00 · 2015-04-13 10:42:48 -07:00 · 67169ec87d
parent 29e4d6c9b5 36ef786228
commit 67169ec87d
1 changed files with 1 additions and 1 deletions
--- 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