config: just ceph.conf, no more cluster.conf

diff --git a/man/ceph.8 b/man/ceph.8
index e036ad4d1dc17047b66d8839a105979415fdbfdc..8c27c80c5d0a847ff4d37ef6ce6e20508b69e432 100644 (file)
--- a/man/ceph.8
+++ b/man/ceph.8
@@ -19,7 +19,7 @@ To watch cluster state changes in real time,
 starting in \fB\-w\fP (watch) mode will print updates to stdout as they occur.  For example,
 to keep an eye on cluster state,
 .IP
-ceph -C cluster.conf -w
+ceph -C ceph.conf -w
 .SH COMMAND LINE MODE
 Finally, to send a single instruction to the monitor cluster (and wait for a 
 response), the command can be specified on the command line.
@@ -33,12 +33,12 @@ monitor cluster.  This is only used for specific monitor commands.
 will write any payload returned by the monitor cluster with its reply to \fIoutfile\fP.
 Only specific monitor commands (e.g. \fIosd getmap\fP) return a payload.
 .TP
-\fB\-C\fI cluster.conf\fR, \fB\-\-cluster-conf=\fIcluster.conf\fR
-Use \fIcluster.conf\fP cluster configuration file instead of the default \fI/etc/ceph/cluster.conf\fP
+\fB\-c\fI ceph.conf\fR, \fB\-\-conf=\fIceph.conf\fR
+Use \fIceph.conf\fP configuration file instead of the default \fI/etc/ceph/ceph.conf\fP
 to determine monitor addresses during startup.
 .TP
 \fB\-m\fI monaddress[:port]\fR
-Connect to specified monitor (instead of looking through \fIcluster.conf\fR).
+Connect to specified monitor (instead of looking through \fIceph.conf\fR).
 .SH EXAMPLES
 To grab a copy of the current OSD map:
 .IP

diff --git a/man/cfuse.8 b/man/cfuse.8
index 430a2f3d174b54784a6f1cf76b3fcb4982e986ad..318194eef0baa5c17113aa32aebe457292ec4ae4 100644 (file)
--- a/man/cfuse.8
+++ b/man/cfuse.8
@@ -10,7 +10,7 @@ cfuse \- FUSE-based client for ceph
 .B cfuse
 is a FUSE (File system in USErspace) client for Ceph distributed
 file system.  It will mount a ceph file system (specified via the
-\fB\-m\fP option for described by \fIcluster.conf\fP (see below) at
+\fB\-m\fP option for described by \fIceph.conf\fP (see below) at
 the specific mount point.
 .PP
 The file system can be unmounted with:
@@ -26,14 +26,10 @@ Detach from console and daemonize after startup.
 .TP
 \fB\-c\fI ceph.conf\fR, \fB\-\-conf=\fIceph.conf\fR
 Use \fIceph.conf\fP configuration file instead of the default \fI/etc/ceph/ceph.conf\fP
-for runtime configuration options.
-.TP
-\fB\-C\fI cluster.conf\fR, \fB\-\-cluster-conf=\fIcluster.conf\fR
-Use \fIcluster.conf\fP cluster configuration file instead of the default \fI/etc/ceph/cluster.conf\fP
 to determine monitor addresses during startup.
 .TP
 \fB\-m\fI monaddress[:port]\fR
-Connect to specified monitor (instead of looking through \fIcluster.conf\fR).
+Connect to specified monitor (instead of looking through \fIceph.conf\fR).
 .SH AVAILABILITY
 .B cfuse
 is part of the Ceph distributed file system.  Please refer to the Ceph wiki at

diff --git a/man/cmds.8 b/man/cmds.8
index bcee5bfee34b403d8ba04ff4a099053bf1e29c98..9b6b86aabc1403e04d99c908b5aaa145770f84d8 100644 (file)
--- a/man/cmds.8
+++ b/man/cmds.8
@@ -15,7 +15,7 @@ namespace, coordinating access to the shared OSD cluster.
 Each 
 .B cmds
 daemon instance should have a unique \fIname\fP.  The name is used
-to identify daemon instances in the \fIcluster.conf\fP.
+to identify daemon instances in the \fIceph.conf\fP.
 .PP
 Once the daemon has started, the monitor cluster will normally assign it
 a logical rank, or put it in a standby pool to take over for another daemon
@@ -40,12 +40,12 @@ do not daemonize after startup (run in foreground), but log to the usual locatio
 Useful when run via 
 .BR crun (8).
 .TP
-\fB\-c\fI cluster.conf\fR, \fB\-\-cluster-conf=\fIcluster.conf\fR
-Use \fIcluster.conf\fP cluster configuration file instead of the default \fI/etc/ceph/cluster.conf\fP
+\fB\-c\fI ceph.conf\fR, \fB\-\-conf=\fIceph.conf\fR
+Use \fIceph.conf\fP configuration file instead of the default \fI/etc/ceph/ceph.conf\fP
 to determine monitor addresses during startup.
 .TP
 \fB\-m\fI monaddress[:port]\fR
-Connect to specified monitor (instead of looking through \fIcluster.conf\fR).
+Connect to specified monitor (instead of looking through \fIceph.conf\fR).
 .SH AVAILABILITY
 .B cmon
 is part of the Ceph distributed file system.  Please refer to the Ceph wiki at

diff --git a/man/cmon.8 b/man/cmon.8
index b2b9c6bd8ed3ccbf4e51350bf32a29178272ac16..176704f163129c2b647108091e675da1b5b50941 100644 (file)
--- a/man/cmon.8
+++ b/man/cmon.8
@@ -26,8 +26,8 @@ do not daemonize after startup (run in foreground), but log to the usual locatio
 Useful when run via 
 .BR crun (8).
 .TP
-\fB\-c\fI cluster.conf\fR, \fB\-\-cluster-conf=\fIcluster.conf\fR
-Use \fIcluster.conf\fP cluster configuration file instead of the default \fI/etc/ceph/cluster.conf\fP
+\fB\-c\fI ceph.conf\fR, \fB\-\-conf=\fIceph.conf\fR
+Use \fIceph.conf\fP configuration file instead of the default \fI/etc/ceph/ceph.conf\fP
 to determine monitor addresses during startup.
 .SH AVAILABILITY
 .B cmon

diff --git a/man/cosd.8 b/man/cosd.8
index f58934fab430abe8ceaf2a627dca1733197e8c54..77be8270278fddabbf777f00fea2dd09674e7ddd 100644 (file)
--- a/man/cosd.8
+++ b/man/cosd.8
@@ -38,12 +38,12 @@ Journal updates to \fIjournal\fP.
 Create an empty object repository.  Normally invoked by
 .BR mkcephfs (8).
 .TP
-\fB\-c\fI cluster.conf\fR, \fB\-\-conf=\fIcluster.conf\fR
-Use \fIcluster.conf\fP configuration file instead of the default \fI/etc/ceph/cluster.conf\fP
+\fB\-c\fI ceph.conf\fR, \fB\-\-conf=\fIceph.conf\fR
+Use \fIceph.conf\fP configuration file instead of the default \fI/etc/ceph/ceph.conf\fP
 for runtime configuration options.
 .TP
 \fB\-m\fI monaddress[:port]\fR
-Connect to specified monitor (instead of looking through \fIcluster.conf\fR).
+Connect to specified monitor (instead of looking through \fIceph.conf\fR).
 .SH AVAILABILITY
 .B cosd
 is part of the Ceph distributed file system.  Please refer to the Ceph wiki at

diff --git a/man/csyn.8 b/man/csyn.8
index 5bcd6d182699249c1e1c048d1072a5299fda1401..6e2ced63278585ac84e329389357d0888f4922bc 100644 (file)
--- a/man/csyn.8
+++ b/man/csyn.8
@@ -22,14 +22,10 @@ Detach from console and daemonize after startup.
 .TP
 \fB\-c\fI ceph.conf\fR, \fB\-\-conf=\fIceph.conf\fR
 Use \fIceph.conf\fP configuration file instead of the default \fI/etc/ceph/ceph.conf\fP
-for runtime configuration options.
-.TP
-\fB\-C\fI cluster.conf\fR, \fB\-\-cluster-conf=\fIcluster.conf\fR
-Use \fIcluster.conf\fP cluster configuration file instead of the default \fI/etc/ceph/cluster.conf\fP
 to determine monitor addresses during startup.
 .TP
 \fB\-m\fI monaddress[:port]\fR
-Connect to specified monitor (instead of looking through \fIcluster.conf\fR).
+Connect to specified monitor (instead of looking through \fIceph.conf\fR).
 .TP
 \fB\-\-num_client\fI num\fR
 Run \fInum\fR different clients, each in a separate thread.

diff --git a/man/mkcephfs.8 b/man/mkcephfs.8
index baa8201fbb0dba2110b6351e5c270e9fa8d51e97..17c8a0fcfd98f03b8ac3c207b81f83e03a28dedf 100644 (file)
--- a/man/mkcephfs.8
+++ b/man/mkcephfs.8
@@ -4,13 +4,13 @@ cosd \- ceph object storage daemon
 .SH SYNOPSIS
 .B cosd
 [ \fB\-a\fP ]
-[ \fB\-C\fP\fI cluster.conf\fP ]
+[ \fB\-c\fP\fI ceph.conf\fP ]
 [ \fB\-\-clobber_old_data\fP ]
 [ \fB\-\-mkbtrfs\fP ]
 .SH DESCRIPTION
 .B mkcephfs
 is used to create an empty Ceph file system, possibly spanning multiple
-hosts.  The \fIcluster.conf\fP file describes the composition of the 
+hosts.  The \fIceph.conf\fP file describes the composition of the 
 Ceph cluster, including which hosts are participating, which daemons
 run where, and which paths are used to store file system data or
 metadata.
@@ -20,15 +20,15 @@ metadata.
 Performs the necessary initialization steps on all hosts in the cluster,
 executing commands via SSH.
 .TP
-\fB\-C\fI cluster.conf\fR, \fB\-\-cluster-conf=\fIcluster.conf\fR
-Use the given cluster conf file instead of the default \fI/etc/ceph/cluster.conf\fP.
+\fB\-c\fI ceph.conf\fR, \fB\-\-conf=\fIceph.conf\fR
+Use the given conf file instead of the default \fI/etc/ceph/ceph.conf\fP.
 .TP
 \fB\-\-clobber_old_data\fR
 Overwrite any existing data found in monitor or osd paths.
 .TP
 \fB\-\-mkbtrfs\fR
 Create and mount the any btrfs file systems specified in the
-\fBcluster.conf\fP for OSD data storage using \fBmkfs.btrfs\fP.  The
+\fBceph.conf\fP for OSD data storage using \fBmkfs.btrfs\fP.  The
 "btrfs devs" and (if it differs from 
 "osd data") "btrfs path" options must be defined.
 .SH AVAILABILITY

diff --git a/src/config.cc b/src/config.cc
index 9199c930852440e63fcd653d127510cea1a571a7..9b45e3fb3a8a2be23c9fc2e18fc3b765449f177c 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -386,7 +386,6 @@ static struct config_option config_optionsp[] = {
        OPTION(log_to_stdout, 0, BOOL, true),
        OPTION(pid_file, 'p', STR, 0),
        OPTION(conf, 'c', STR, INSTALL_PREFIX "/etc/ceph/ceph.conf"),
-       OPTION(cluster_conf, 'C', STR, INSTALL_PREFIX "/etc/ceph/cluster.conf"),
        OPTION(chdir, 0, STR, "/"),
        OPTION(fake_clock, 0, BOOL, false),
        OPTION(fakemessenger_serialize, 0, BOOL, true),
@@ -839,8 +838,6 @@ void parse_startup_config_options(std::vector<const char*>& args, const char *mo
 
     if (CMD_EQ("conf", 'c')) {
        SAFE_SET_ARG_VAL(&g_conf.conf, STR);
-    } else if (CMD_EQ("cluster_conf", 'C')) {
-       SAFE_SET_ARG_VAL(&g_conf.cluster_conf, STR);
     } else if (CMD_EQ("monmap", 'M')) {
        SAFE_SET_ARG_VAL(&g_conf.monmap, STR);
     } else if (CMD_EQ("bind", 0)) {
@@ -900,10 +897,8 @@ void configure_client_mode()
 
 void generic_usage()
 {
-  cerr << "   -C cluster.conf or --cluster-conf=cluster.conf\n";
-  cerr << "        get monitor IP(s) from given conf (instead of /etc/ceph/cluster.conf)\n";
   cerr << "   -c ceph.conf or --conf=ceph.conf\n";
-  cerr << "        get runtime options from given conf file" << std::endl;
+  cerr << "        get options from given conf file" << std::endl;
 }
 
 void generic_server_usage()

diff --git a/src/config.h b/src/config.h
index d1eb94790d31734d0763144a91f83163dfe809e7..c92c5c006a31ba9c7deaae2e02fbf7753f022c90 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -69,7 +69,6 @@ struct md_config_t {
   const char *pid_file;
 
   const char *conf;
-  const char *cluster_conf;
 
   const char *chdir;
 

diff --git a/src/init-ceph b/src/init-ceph
index 430d8bf0338288d27143aa57732c3525a662fd5e..2d47c5f9aab2190144d9c7141614d5eaa49c859b 100755 (executable)
--- a/src/init-ceph
+++ b/src/init-ceph
@@ -25,7 +25,7 @@ fi
 
 usage_exit() {
     echo "usage: $0 [options] {start|stop|restart} [mon|osd|mds]..."
-    printf "\t-c cluster.conf\n"
+    printf "\t-c ceph.conf\n"
     printf "\t--valgrind\trun via valgrind\n"
     exit
 }

diff --git a/src/mkcephfs b/src/mkcephfs
index 214fe14d6a54f493bc82b0d57a0765f62c274415..998bb471cee1435eb392ad4daac92b172f678ae4 100755 (executable)
--- a/src/mkcephfs
+++ b/src/mkcephfs
@@ -13,7 +13,7 @@ else
 fi
 
 usage_exit() {
-    echo "usage: $0 [--allhosts] [-c cluster.conf] [--clobber_old_data] [--mkbtrfs]"
+    echo "usage: $0 [--allhosts] [-c ceph.conf] [--clobber_old_data] [--mkbtrfs]"
     exit
 }
 

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index 12e13d2c822d04b1931b628d8ada21ff799f4e60..7290eb3c065cb07c18e3abe5b28e601fd12dd75c 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -97,8 +97,8 @@ int MonClient::get_monmap(MonMap *pmonmap)
 
   if (!g_conf.mon_host) {
     // cluster conf?
-    ConfFile a(g_conf.cluster_conf);
-    ConfFile b("cluster.conf");
+    ConfFile a(g_conf.conf);
+    ConfFile b("ceph.conf");
     ConfFile *c = 0;
 
     if (a.parse())

diff --git a/src/vstart.sh b/src/vstart.sh
index 175d16b81e9e2b0cb2e2baae9738ceebf17282af..7d8bc273bc10b3a398b508954e96be4161ddd718 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -14,7 +14,7 @@ let localhost=0
 valgrind=""
 MON_ADDR=""
 
-conf="cluster.conf"
+conf="ceph.conf"
 
 usage="usage: $0 [option]... [mon] [mds] [osd]\n"
 usage=$usage"options:\n"