Merge pull request #29942 from ibm-contribs/issue-29546

Automatic merge from submit-queue Documented second arg to create-flanneld-opts in cluster/ubuntu/util.sh This is a bug fix, no release note needed. Fixes #29546

Merge pull request #29942 from ibm-contribs/issue-29546
c19a65c0 · Kubernetes Submit Queue · GitHub · 4f9c3d52 · 923b2b47 · c19a65c0
Commit c19a65c0 authored Aug 02, 2016 by Kubernetes Submit Queue Committed by GitHub Aug 02, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

util.sh cluster/ubuntu/util.sh +1 -0

No files found.
--- a/cluster/ubuntu/util.sh
+++ b/cluster/ubuntu/util.sh
@@ -318,6 +318,7 @@ EOF

 # Create ~/kube/default/flanneld with proper contents.
 # $1: The one hostname or IP address at which the etcd leader listens.
+# $2: The IP address or network interface for the local Flannel daemon to use
 function create-flanneld-opts() {
  cat <<EOF > ~/kube/default/flanneld
 FLANNEL_OPTS="--etcd-endpoints=http://${1}:4001 \