Merge pull request #3077 from saad-ali/FixCloudConfigBuildBreak

Fix kube-controller-manager failing to start because "Jinja variable 'cloud_config' is undefined"

Merge pull request #3077 from saad-ali/FixCloudConfigBuildBreak
5cd91a2b · Daniel Smith · ba25ae49 · ec6d4c60 · 5cd91a2b
Commit 5cd91a2b authored Dec 19, 2014 by Daniel Smith
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

default cluster/saltbase/salt/kube-controller-manager/default +1 -0

No files found.
--- a/cluster/saltbase/salt/kube-controller-manager/default
+++ b/cluster/saltbase/salt/kube-controller-manager/default
+{% set cloud_config = "" -%}
 {% set daemon_args = "$DAEMON_ARGS" -%}
 {% if grains['os_family'] == 'RedHat' -%}
 	{% set daemon_args = "" -%}