Merge pull request #6719 from litian54/master

Fix Rendering SLS 'base:nginx' failed if 'cloud' is not defined in minio...
This commit is contained in:
Dawn Chen 2015-04-13 10:42:48 -07:00
commit 67169ec87d

View File

@ -28,7 +28,7 @@ nginx:
- group: root - group: root
- mode: 644 - mode: 644
{% if grains.cloud in ['gce'] %} {% if grains.cloud is defined and grains.cloud in ['gce'] %}
/etc/kubernetes/manifests/nginx.json: /etc/kubernetes/manifests/nginx.json:
file: file:
- managed - managed