Merge branch 'master' into weave_network_plugin

This commit is contained in:
Smaine Kahlouch 2016-02-10 18:33:48 +01:00
commit 05c8a29688

View file

@ -22,6 +22,7 @@ spec:
{% endif%} {% endif%}
- --kubeconfig=/etc/kubernetes/node-kubeconfig.yaml - --kubeconfig=/etc/kubernetes/node-kubeconfig.yaml
{% endif %} {% endif %}
- --bind-address={{ ip | default(ansible_default_ipv4.address) }}
securityContext: securityContext:
privileged: true privileged: true
volumeMounts: volumeMounts: