Merge pull request #23079 from andyzheng0831/hybrid

Auto commit by PR queue bot (cherry picked from commit d5316c2)
kubernetes · Mar 24, 2016 · bf5b6f0 · bf5b6f0
1 parent b656313
commit bf5b6f0
Showing 1 changed file with 5 additions and 0 deletions.
diff --git 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
 }