summaryrefslogtreecommitdiff
path: root/src/vstart.sh
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-05-14 14:16:25 -0700
committerSage Weil <sage@inktank.com>2012-05-16 16:36:52 -0700
commit288635843ae6ff1821e82f5b9b663e0ac5be75ff (patch)
tree87f6f1b997d874f8956e57b7a6a1de7bd45fa272 /src/vstart.sh
parent515649558d5edebfd705e63bc34cd74d2db1f682 (diff)
downloadceph-288635843ae6ff1821e82f5b9b663e0ac5be75ff.tar.gz
init-ceph: ignore sections without 'host' defined
This will make it easier for sysvinit and upstart to coexist. We will break existing users who have a separate .conf for each node and didn't add host lines. We'll need to make note of that in the release notes. Fixes: #2404 Signed-off-by: Sage Weil <sage@inktank.com>
Diffstat (limited to 'src/vstart.sh')
-rwxr-xr-xsrc/vstart.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/vstart.sh b/src/vstart.sh
index 5b0cb14b7aa..02dfc230d0e 100755
--- a/src/vstart.sh
+++ b/src/vstart.sh
@@ -314,6 +314,7 @@ EOF
if [ $overwrite_conf -eq 1 ]; then
cat <<EOF >> $conf
[mon.$f]
+ host = $HOSTNAME
mon data = dev/mon.$f
mon addr = $IP:$(($CEPH_PORT+$count))
EOF
@@ -352,6 +353,7 @@ if [ "$start_osd" -eq 1 ]; then
if [ $overwrite_conf -eq 1 ]; then
cat <<EOF >> $conf
[osd.$osd]
+ host = $HOSTNAME
osd data = dev/osd$osd
osd journal = dev/osd$osd.journal
osd journal size = 100
@@ -396,6 +398,7 @@ if [ "$start_mds" -eq 1 ]; then
if [ $overwrite_conf -eq 1 ]; then
cat <<EOF >> $conf
[mds.$name]
+ host = $HOSTNAME
EOF
if [ "$cephx" -eq 1 ]; then
cat <<EOF >> $conf