Merge pull request #7829 from roberthbailey/allocate-node-cidrs

Set allocate_node_cidrs to be blank by default.
kubernetes · May 6, 2015 · 4f83749 · 4f83749
2 parents 06c2f4e + 357df12
commit 4f83749
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest b/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
@@ -1,6 +1,7 @@
 {% set machines = ""-%}
 {% set cluster_name = "" -%}
 {% set cluster_class_b = "" -%}
+{% set allocate_node_cidrs = "" -%}
 {% set minion_regexp = "--minion_regexp=.*" -%}
 {% set sync_nodes = "--sync_nodes=true" -%}