From 2c59a3c4a42f158607f447a3883e5c970a74b6ac Mon Sep 17 00:00:00 2001
From: Brendan Burns <bburns@google.com>
Date: Fri, 12 Jun 2015 21:47:30 -0700
Subject: [PATCH] Fix the scripts to default empty string if EXTRA_DOCKER_OPTS
 isn't set.

---
 cluster/gce/coreos/helper.sh | 2 +-
 cluster/gce/debian/helper.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cluster/gce/coreos/helper.sh b/cluster/gce/coreos/helper.sh
index 3901666ca5b..d50fb58f09e 100644
--- a/cluster/gce/coreos/helper.sh
+++ b/cluster/gce/coreos/helper.sh
@@ -84,7 +84,7 @@ ADMISSION_CONTROL=$(yaml-quote ${ADMISSION_CONTROL:-})
 MASTER_IP_RANGE=$(yaml-quote ${MASTER_IP_RANGE})
 KUBERNETES_MASTER_NAME=$(yaml-quote ${MASTER_NAME})
 ZONE=$(yaml-quote ${ZONE})
-EXTRA_DOCKER_OPTS=$(yaml-quote ${EXTRA_DOCKER_OPTS})
+EXTRA_DOCKER_OPTS=$(yaml-quote ${EXTRA_DOCKER_OPTS:-})
 ENABLE_DOCKER_REGISTRY_CACHE=$(yaml-quote ${ENABLE_DOCKER_REGISTRY_CACHE:-false})
 PROJECT_ID=$(yaml-quote ${PROJECT})
 KUBERNETES_CONTAINER_RUNTIME=$(yaml-quote ${CONTAINER_RUNTIME})
diff --git a/cluster/gce/debian/helper.sh b/cluster/gce/debian/helper.sh
index 264c4259eea..2b29eb26d7b 100644
--- a/cluster/gce/debian/helper.sh
+++ b/cluster/gce/debian/helper.sh
@@ -70,7 +70,7 @@ EOF
     cat >>$file <<EOF
 KUBERNETES_MASTER: "false"
 ZONE: $(yaml-quote ${ZONE})
-EXTRA_DOCKER_OPTS: $(yaml-quote ${EXTRA_DOCKER_OPTS})
+EXTRA_DOCKER_OPTS: $(yaml-quote ${EXTRA_DOCKER_OPTS:-})
 ENABLE_DOCKER_REGISTRY_CACHE: $(yaml-quote ${ENABLE_DOCKER_REGISTRY_CACHE:-false})
 KUBELET_CERT: $(yaml-quote ${KUBELET_CERT_BASE64:-})
 KUBELET_KEY: $(yaml-quote ${KUBELET_KEY_BASE64:-})