From 2ea9ef53f317b5384f49a9d14f30197516622ca8 Mon Sep 17 00:00:00 2001
From: Andy Zheng <qzheng@google.com>
Date: Wed, 16 Mar 2016 13:01:02 -0700
Subject: [PATCH] Trusty: Support hybrid cluster with nodes on ContainerVM

---
 cluster/gce/util.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/cluster/gce/util.sh b/cluster/gce/util.sh
index ae9add43021..1f9d0a32ebe 100755
--- a/cluster/gce/util.sh
+++ b/cluster/gce/util.sh
@@ -689,6 +689,11 @@ function create-nodes-template() {
 
   local template_name="${NODE_INSTANCE_PREFIX}-template"
 
+  # For master on trusty, we support running nodes on ContainerVM or trusty.
+  if [[ "${OS_DISTRIBUTION}" == "trusty" ]] && \
+     [[ "${NODE_IMAGE}" == container* ]]; then
+    source "${KUBE_ROOT}/cluster/gce/debian/helper.sh"
+  fi
   create-node-instance-template $template_name
 }