Merge pull request #2131 from bacongobbler/router_num

fix(router): publish routers to /deis/router/hosts

Author: Matthew Fisher

docs/managing_deis/router_settings.rst

@@ -19,12 +19,11 @@ Settings set by router
 --------------------------
 The following etcd keys are set by the router component, typically in its /bin/boot script.
 
-===========================              =================================================================================
+=============================            ===================================================================================
 setting                                  description
-===========================              =================================================================================
-/deis/router/$HOST/host                  IP address of the host running this router (there can be multiple routers)
-/deis/router/$HOST/port                  port used by this router service (there can be multiple routers) (default: 80)
-===========================              =================================================================================
+=============================            ===================================================================================
+/deis/router/hosts/$HOST                 IP address and port of the host running this router (there can be multiple routers)
+=============================            ===================================================================================
 
 Settings used by router
 ---------------------------

router/bin/boot

@@ -13,7 +13,7 @@ set -eo pipefail
 export ETCD_PORT=${ETCD_PORT:-4001}
 export ETCD="$HOST:$ETCD_PORT"
 export ETCD_PATH=${ETCD_PATH:-/deis/router}
-export HOST_ETCD_PATH=${HOST_ETCD_PATH:-/deis/router/$HOST}
+export HOST_ETCD_PATH=${HOST_ETCD_PATH:-/deis/router/hosts/$HOST}
 export ETCD_TTL=${ETCD_TTL:-10}
 
 # wait for etcd to be available
@@ -85,8 +85,7 @@ if [[ ! -z $EXTERNAL_PORT ]]; then
 
   # while the port is listening, publish to etcd
   while [[ ! -z $(netstat -lnt | awk "\$6 == \"LISTEN\" && \$4 ~ \".$PORT\" && \$1 ~ \"$PROTO.?\"") ]] ; do
-    etcdctl --no-sync -C $ETCD set $HOST_ETCD_PATH/host $HOST --ttl $ETCD_TTL >/dev/null
-    etcdctl --no-sync -C $ETCD set $HOST_ETCD_PATH/port $EXTERNAL_PORT --ttl $ETCD_TTL >/dev/null
+    etcdctl --no-sync -C $ETCD set $HOST_ETCD_PATH "$HOST:$EXTERNAL_PORT" --ttl $ETCD_TTL >/dev/null
     sleep $(($ETCD_TTL/2)) # sleep for half the TTL
   done
 

router/tests/router_test.go

@@ -60,8 +60,9 @@ func TestRouter(t *testing.T) {
 	time.Sleep(5000 * time.Millisecond)
 	dockercli.DeisServiceTest(t, name, port, "http")
 	etcdutils.VerifyEtcdValue(t, "/deis/router/gzip", "on", etcdPort)
-	routerKeyPrefix := "/deis/router/" + host
-	etcdutils.VerifyEtcdValue(t, routerKeyPrefix+"/host", host, etcdPort)
-	etcdutils.VerifyEtcdValue(t, routerKeyPrefix+"/port", port, etcdPort)
+	etcdutils.VerifyEtcdValue(t,
+		"/deis/router/hosts/"+host,
+		fmt.Sprintf("%s:%s", host, port),
+		etcdPort)
 	_ = cli.CmdRm("-f", name)
 }