Merge pull request #26438 from aanm/adding-etcd-addr-option

Automatic merge from submit-queue Add -addr option to hack/lib/etcd.h Added -addr to etcd hack script so it listens on the same address specified in the `host` variable. Signed-off-by: André Martins <aanm90@gmail.com>

Merge pull request #26438 from aanm/adding-etcd-addr-option
fe5edcf1 · k8s-merge-robot · 023f11dc · 10fb9bdc · fe5edcf1
Commit fe5edcf1 authored May 29, 2016 by k8s-merge-robot
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

etcd.sh hack/lib/etcd.sh +2 -2

No files found.
--- a/hack/lib/etcd.sh
+++ b/hack/lib/etcd.sh
@@ -41,8 +41,8 @@ kube::etcd::start() {
  # Start etcd
  ETCD_DIR=$(mktemp -d 2>/dev/null || mktemp -d -t test-etcd.XXXXXX)
-  kube::log::info "etcd -data-dir ${ETCD_DIR} --bind-addr ${ETCD_HOST}:${ETCD_PORT} >/dev/null 2>/dev/null"
+  kube::log::info "etcd -addr ${ETCD_HOST}:${ETCD_PORT} -data-dir ${ETCD_DIR} --bind-addr ${ETCD_HOST}:${ETCD_PORT} >/dev/null 2>/dev/null"
-  etcd -data-dir ${ETCD_DIR} --bind-addr ${ETCD_HOST}:${ETCD_PORT} >/dev/null 2>/dev/null &
+  etcd -addr ${ETCD_HOST}:${ETCD_PORT} -data-dir ${ETCD_DIR} --bind-addr ${ETCD_HOST}:${ETCD_PORT} >/dev/null 2>/dev/null &
  ETCD_PID=$!
  echo "Waiting for etcd to come up."