From 344856455c5452d573dd06eb26c52963dfa3105e Mon Sep 17 00:00:00 2001 From: Anthony Alba Date: Mon, 30 Nov 2015 16:44:31 +0800 Subject: [PATCH] init-ceph.in: Allow custom cluster names during startup. Signed-off-by: Richard Chan --- src/init-ceph.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/init-ceph.in b/src/init-ceph.in index 2ff98c7..245068a 100644 --- a/src/init-ceph.in +++ b/src/init-ceph.in @@ -282,7 +286,7 @@ for name in $what; do lockfile="" fi - get_conf asok "$run_dir/ceph-$type.$id.asok" "admin socket" + get_conf asok "$run_dir/$cluster-$type.$id.asok" "admin socket" case "$command" in start) @@ -395,8 +399,8 @@ for name in $what; do # these keys. it's also true for legacy installs # via mkcephfs, which is fine too; there is no harm # in creating these keys. - get_conf mon_data "/var/lib/ceph/mon/ceph-$id" "mon data" - if [ "$mon_data" = "/var/lib/ceph/mon/ceph-$id" -a "$asok" = "/var/run/ceph/ceph-mon.$id.asok" ]; then + get_conf mon_data "/var/lib/ceph/mon/$cluster-$id" "mon data" + if [ "$mon_data" = "/var/lib/ceph/mon/$cluster-$id" -a "$asok" = "/var/run/ceph/$cluster-mon.$id.asok" ]; then echo Starting ceph-create-keys on $host... cmd2="$SBINDIR/ceph-create-keys --cluster $cluster -i $id 2> /dev/null &" do_cmd "$cmd2" -- 2.1.0