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

Set allocate_node_cidrs to be blank by default.

Merge pull request #7829 from roberthbailey/allocate-node-cidrs
4f83749d · Jerzy Szczepkowski · 06c2f4e3 · 357df12c · 4f83749d
Commit 4f83749d authored May 06, 2015 by Jerzy Szczepkowski
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

kube-controller-manager.manifest .../kube-controller-manager/kube-controller-manager.manifest +1 -0

No files found.
--- a/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
+++ b/cluster/saltbase/salt/kube-controller-manager/kube-controller-manager.manifest
 {% set machines = ""-%}
 {% set cluster_name = "" -%}
 {% set cluster_class_b = "" -%}
+{% set allocate_node_cidrs = "" -%}
 {% set minion_regexp = "--minion_regexp=.*" -%}
 {% set sync_nodes = "--sync_nodes=true" -%}