From 77d13db307c4cc66796dd0b99eb6c05d0cfd8e8c Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@google.com>
Date: Wed, 24 Sep 2014 10:26:39 -0700
Subject: [PATCH] Fix the vagrant build.

---
 cluster/saltbase/salt/nginx/init.sls | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/cluster/saltbase/salt/nginx/init.sls b/cluster/saltbase/salt/nginx/init.sls
index e4c474bd4a6..08879167538 100644
--- a/cluster/saltbase/salt/nginx/init.sls
+++ b/cluster/saltbase/salt/nginx/init.sls
@@ -10,11 +10,13 @@ nginx:
       - file: /usr/share/nginx/htpasswd
       - cmd: /usr/share/nginx/server.cert
 
-{% if grains.cloud == 'gce' %}
-  {% set cert_ip='_use_gce_external_ip_' %}
-{% endif %}
-{% if grains.cloud == 'vagrant' %}
-  {% set cert_ip=grains.fqdn_ip4 %}
+{% if grains.cloud is defined %}
+  {% if grains.cloud == 'gce' %}
+    {% set cert_ip='_use_gce_external_ip_' %}
+  {% endif %}
+  {% if grains.cloud == 'vagrant' %}
+    {% set cert_ip=grains.fqdn_ip4 %}
+  {% endif %}
 {% endif %}
 # If there is a pillar defined, override any defaults.
 {% if pillar['cert_ip'] is defined %}