github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1350 from brendandburns/privilege

Browse Source 
fix salt.
This commit is contained in:
Joe Beda
2014-09-17 17:14:42 -07:00
parent 698fbddc9d bb829ce8f6
commit 7f05db56c5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cluster/saltbase/salt/apiserver/default
View File

@@ -52,4 +52,4 @@
{% endif %} {% endif %}
{% endif %} {% endif %}
DAEMON_ARGS="{{daemon_args}} {{address}} {{machines}} {{etcd_servers}} {{ minion_regexp }} {{ cloud_provider }} --allow_privileged {{pillars['allow_privileged']}}" DAEMON_ARGS="{{daemon_args}} {{address}} {{machines}} {{etcd_servers}} {{ minion_regexp }} {{ cloud_provider }} --allow_privileged {{pillar['allow_privileged']}}"

2
cluster/saltbase/salt/kubelet/default
View File

@@ -17,4 +17,4 @@
{% endif %} {% endif %}
DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{hostname_override}} {{address}} {{config}} --allow_privileged {{pillars['allow_privileged']}}" DAEMON_ARGS="{{daemon_args}} {{etcd_servers}} {{hostname_override}} {{address}} {{config}} --allow_privileged {{pillar['allow_privileged']}}"