Merge branch 'master' into weave_network_plugin

2016-02-10 18:33:48 +01:00
parent 793d665db4 50da691d45
commit 05c8a29688
1 changed files with 1 additions and 0 deletions
--- a/roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
+++ b/roles/kubernetes/node/templates/manifests/kube-proxy.manifest.j2
@ -22,6 +22,7 @@ spec:
 {%   endif%}
    - --kubeconfig=/etc/kubernetes/node-kubeconfig.yaml
 {% endif %}
+    - --bind-address={{ ip | default(ansible_default_ipv4.address) }}
    securityContext:
      privileged: true
    volumeMounts: