From: Sage Weil <sage@redhat.com>
Date: Wed, 21 Jan 2015 21:03:57 +0000 (-0800)
Subject: vstart.sh: pull default CEPH_PORT from .ceph_port
X-Git-Tag: v0.93~207^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F3458%2Fhead;p=ceph.git

vstart.sh: pull default CEPH_PORT from .ceph_port

This lets you put a unique port in .ceph_port in your working dir and
vstart.sh instances will avoid each other without having to pass
CEPH_PORT=... to each one each time.

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/src/.gitignore b/src/.gitignore
index 531da972b227..d714f13a72c1 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -82,3 +82,4 @@ Makefile
 # old dir, may in use by older branches
 /leveldb
 /mkcephfs
+/.ceph_port
diff --git a/src/vstart.sh b/src/vstart.sh
index 469180d7a235..f766cf1179d5 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -261,7 +261,10 @@ fi
 # export CEPH_ARGS="--lockdep 1"
 
 [ -z "$CEPH_BIN" ] && CEPH_BIN=.
-[ -z "$CEPH_PORT" ] && CEPH_PORT=6789
+if [ -z "$CEPH_PORT" ]; then
+    CEPH_PORT=6789
+    [ -e ".ceph.port" ] && CEPH_PORT=`cat .ceph_port`
+fi
 
 
 # sudo if btrfs
@@ -294,6 +297,7 @@ else
     echo ip $IP
 fi
 echo "ip $IP"
+echo "port $PORT"