config: rename 'keys file' to 'keyring'

diff --git a/src/common/common_init.cc b/src/common/common_init.cc
index 04c9703f30953da1d5fee35ec4e30aecdc4a9229..8cc2485c8ba235d6ab07bd98273c6bad25c00cb6 100644 (file)
--- a/src/common/common_init.cc
+++ b/src/common/common_init.cc
@@ -33,7 +33,7 @@ void common_init(std::vector<const char*>& args, const char *module_type, bool d
     _dout_open_log();
 
   if (init_keys && is_supported_auth(CEPH_AUTH_CEPHX)) {
-    g_keyring.load_master(g_conf.keys_file);
+    g_keyring.load_master(g_conf.keyring);
   }
 }
 

diff --git a/src/config.cc b/src/config.cc
index 098a355d2da435e6270721cc9c9d29751ab270f1..8c8bba478fc6612d39be3d5ebd91d224fb00579b 100644 (file)
--- a/src/config.cc
+++ b/src/config.cc
@@ -321,7 +321,7 @@ static struct config_option config_optionsp[] = {
        OPTION(log_sym_dir, 0, OPT_STR, 0),
        OPTION(log_to_stdout, 0, OPT_BOOL, true),
        OPTION(pid_file, 0, OPT_STR, "/var/run/ceph/$type.$id.pid"),
-       OPTION(conf, 'c', OPT_STR, "/etc/ceph/ceph.conf, ~/ceph/config, ceph.conf"),
+       OPTION(conf, 'c', OPT_STR, "/etc/ceph/ceph.conf, ~/.ceph/config, ceph.conf"),
        OPTION(chdir, 0, OPT_STR, "/"),
        OPTION(fake_clock, 0, OPT_BOOL, false),
        OPTION(fakemessenger_serialize, 0, OPT_BOOL, true),
@@ -353,7 +353,7 @@ static struct config_option config_optionsp[] = {
        OPTION(debug_paxos, 0, OPT_INT, 0),
        OPTION(debug_tp, 0, OPT_INT, 0),
        OPTION(debug_auth, 0, OPT_INT, 1),
-       OPTION(keys_file, 'k', OPT_STR, "~/.ceph/keyring.bin, /etc/ceph/keyring.bin, .ceph_keyring"),
+       OPTION(keyring, 'k', OPT_STR, "~/.ceph/keyring.bin, /etc/ceph/keyring.bin, .ceph_keyring"),
        OPTION(supported_auth, 0, OPT_STR, "none"),
        OPTION(clock_lock, 0, OPT_BOOL, false),
        OPTION(clock_tare, 0, OPT_BOOL, false),

diff --git a/src/config.h b/src/config.h
index 8714d822ec9e273db5d14b006255d9a94acee702..41fe17d40b8fab02232c49ae39459f0b9cec11ec 100644 (file)
--- a/src/config.h
+++ b/src/config.h
@@ -112,7 +112,7 @@ struct md_config_t {
   bool clock_tare;
 
   // auth
-  char *keys_file;
+  char *keyring;
   char *supported_auth;
 
   // messenger

diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc
index e1821dd69d5e751fe900e11cf301ad6aacaf1ec5..8d9bb822d09a584f9e107fc66eaf2ca2aa7a1a64 100644 (file)
--- a/src/mon/AuthMonitor.cc
+++ b/src/mon/AuthMonitor.cc
@@ -92,17 +92,17 @@ void AuthMonitor::on_active()
 void AuthMonitor::create_initial(bufferlist& bl)
 {
   dout(0) << "create_initial -- creating initial map" << dendl;
-  if (g_conf.keys_file) {
+  if (g_conf.keyring) {
     map<string, EntityAuth> keys_map;
-    dout(0) << "reading initial keys file " << dendl;
+    dout(0) << "reading initial keyring " << dendl;
     bufferlist bl;
 
-    string k = g_conf.keys_file;
+    string k = g_conf.keyring;
     list<string> ls;
     get_str_list(k, ls);
     int r = -1;
     for (list<string>::iterator p = ls.begin(); p != ls.end(); p++)
-      if ((r = bl.read_file(g_conf.keys_file)) >= 0)
+      if ((r = bl.read_file(g_conf.keyring)) >= 0)
        break;
     if (r >= 0) {
       bool read_ok = false;
@@ -111,7 +111,7 @@ void AuthMonitor::create_initial(bufferlist& bl)
         ::decode(keys_map, iter);
         read_ok = true;
       } catch (buffer::error *err) {
-        cerr << "error reading file " << g_conf.keys_file << std::endl;
+        cerr << "error reading file " << g_conf.keyring << std::endl;
       }
       if (read_ok) {
         map<string, EntityAuth>::iterator iter = keys_map.begin();

diff --git a/src/vstart.sh b/src/vstart.sh
index a3e801c69dcfa3f0d81ac77c8c460ea106ec3bf8..9bae9b148c0aafc3e504fd1b9061116742364c5a 100755 (executable)
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -301,7 +301,7 @@ EOF
                for f in `seq 0 $((CEPH_NUM_MON-1))`
                do
                    cmd="$CEPH_BIN/mkmonfs -c $conf --clobber --mon-data=dev/mon$f -i $f --monmap=$monmap_fn --osdmap=$osdmap_fn"
-                   [ "$cephx" -eq 1 ] && cmd="$cmd --keys-file=$keyring_fn"
+                   [ "$cephx" -eq 1 ] && cmd="$cmd --keyring=$keyring_fn"
                    echo $cmd
                    $cmd
                done
@@ -329,7 +329,7 @@ if [ "$start_osd" -eq 1 ]; then
         osd journal size = 100
 EOF
                    [ "$cephx" -eq 1 ] && cat <<EOF >> $conf
-        keys file = dev/osd$osd/osd$osd.keyring
+        keyring = dev/osd$osd/osd$osd.keyring
 EOF
            fi
            echo mkfs osd$osd
@@ -375,7 +375,7 @@ EOF
                fi
                if [ "$cephx" -eq 1 ]; then
                    cat <<EOF >> $conf
-        keys file = $key_fn
+        keyring = $key_fn
 EOF
                    cat <<EOF > $mds_caps
 ; generated by vstart.sh on `date`