From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Fri, 8 Aug 2014 14:16:20 +0000 (-0400)
Subject: init-ceph: conditionally update  after argparsing
X-Git-Tag: v0.85~60^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44ed1885fb588aad7e4729373e06c5933178b5e5;p=ceph.git

init-ceph: conditionally update  after argparsing

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/src/init-ceph.in b/src/init-ceph.in
index 8d2ea7a4a05..03d0930060b 100644
--- a/src/init-ceph.in
+++ b/src/init-ceph.in
@@ -114,6 +114,8 @@ monaddr=
 dofsmount=1
 dofsumount=0
 verbose=0
+use_default_conf=1
+
 
 while echo $1 | grep -q '^-'; do     # FIXME: why not '^-'?
 case $1 in
@@ -154,6 +156,7 @@ case $1 in
 	    [ -z "$2" ] && usage_exit
 	    options="$options $1"
 	    shift
+        use_default_conf=0
 	    conf=$1
 	    ;;
     --cluster )
@@ -177,6 +180,20 @@ options="$options $1"
 shift
 done
 
+
+# if `--cluster` was not passed in, fallback to looking at the config name
+if ! [[ -n "$cluster" ]]; then
+    cluster=`echo $conf | awk -F'/' '{print $(NF)}' | cut -d'.' -f 1`
+else
+    # if we were told to use a given cluster name then $conf needs to be updated
+    # but just define it if `--conf` was not specified, otherwise we would be silently
+    # overriding $conf even if it was defined with `--conf`
+    if [ $use_default_conf -eq 1 ]; then
+        conf="/etc/ceph/$cluster.conf"
+    fi
+fi
+
+
 verify_conf
 
 command=$1
@@ -196,11 +213,6 @@ fi
 for name in $what; do
     type=`echo $name | cut -c 1-3`   # e.g. 'mon', if $item is 'mon1'
     id=`echo $name | cut -c 4- | sed 's/^\\.//'`
-
-    # if `--cluster` was not passed in, fallback to looking at the config name
-    if ! [[ -n "$cluster" ]]; then
-        cluster=`echo $conf | awk -F'/' '{print $(NF)}' | cut -d'.' -f 1`
-    fi
     num=$id
     name="$type.$id"