mkcephfs: copy ceph.conf to /etc/ceph/ceph.conf (when -a)

You can disable this with --no-copy-conf.

Signed-off-by: Sage Weil <[email protected]>

doc/man/8/mkcephfs.rst

@@ -77,6 +77,11 @@ Options
    and (if it differs from "osd data") "btrfs path" options must be
    defined.
 
+.. option:: --no-copy-conf
+
+   By default, mkcephfs with -a will copy the new configuration to
+   /etc/ceph/ceph.conf on each node in the cluster.  This option
+   disables that behavior.
 
 Subcommands
 ===========

man/mkcephfs.8

@@ -1,4 +1,4 @@
-.TH "MKCEPHFS" "8" "September 22, 2011" "dev" "Ceph"
+.TH "MKCEPHFS" "8" "October 17, 2011" "dev" "Ceph"
 .SH NAME
 mkcephfs \- create a ceph file system
 .
@@ -117,6 +117,13 @@ ceph.conf for OSD data storage using mkfs.btrfs. The "btrfs devs"
 and (if it differs from "osd data") "btrfs path" options must be
 defined.
 .UNINDENT
+.INDENT 0.0
+.TP
+.B \-\-no\-copy\-conf
+By default, mkcephfs with \-a will copy the new configuration to
+/etc/ceph/ceph.conf on each node in the cluster.  This option
+disables that behavior.
+.UNINDENT
 .SH SUBCOMMANDS
 .sp
 The sub\-commands performed during cluster setup can be run individually with

src/mkcephfs.in

@@ -88,6 +88,7 @@ dir=""
 moreargs=""
 auto_action=0
 manual_action=0
+nocopyconf=0
 
 while [ $# -ge 1 ]; do
 case $1 in
@@ -132,6 +133,9 @@ case $1 in
     --mkbtrfs)
 	    mkbtrfs=1
 	    ;;
+    --no-copy-conf)
+	    nocopyconf=1
+	    ;;
     --conf | -c)
 	    [ -z "$2" ] && usage_exit
 	    shift
@@ -441,8 +445,18 @@ if [ $allhosts -eq 1 ]; then
 	    do_cmd "mkdir -p $rdir"
 	    scp -q $dir/conf $host:$rdir
 	    scp -q $dir/monmap $host:$rdir
+
+	    if [ $nocopyconf -eq 0 ]; then
+		# also put conf at /etc/ceph/ceph.conf
+		scp -q $dir/conf $host:/etc/ceph/ceph.conf
+	    fi
 	else
 	    rdir=$dir
+
+	    if [ $nocopyconf -eq 0 ]; then
+		# also put conf at /etc/ceph/ceph.conf
+		cp $dir/conf /etc/ceph/ceph.conf
+	    fi
 	fi
 
 	if [ $mkbtrfs -eq 1 ] && [ "$type" = "osd" ]; then
@@ -476,8 +490,18 @@ if [ $allhosts -eq 1 ]; then
 	    echo pushing everything to $host
 	    ssh $host mkdir -p $rdir
 	    scp -q $dir/* $host:$rdir
+
+	    if [ $nocopyconf -eq 0 ]; then
+		# also put conf at /etc/ceph/ceph.conf
+		scp -q $dir/conf $host:/etc/ceph/ceph.conf
+	    fi
 	else
 	    rdir=$dir
+
+	    if [ $nocopyconf -eq 0 ]; then
+	        # also put conf at /etc/ceph/ceph.conf
+		cp $dir/conf /etc/ceph/ceph.conf
+	    fi
 	fi
 
 	do_root_cmd "$0 -d $rdir --init-daemon $name"