From: Sage Weil <sage@newdream.net>
Date: Sat, 28 Feb 2009 00:41:07 +0000 (-0800)
Subject: rename sample.startup.conf
X-Git-Tag: v0.7~101^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=dcec5b8713f13866d645cfa980be75beb90d2eab;p=ceph.git

rename sample.startup.conf
---

diff --git a/src/sample.cluster.conf b/src/sample.cluster.conf
new file mode 100644
index 000000000000..d2daca36dbae
--- /dev/null
+++ b/src/sample.cluster.conf
@@ -0,0 +1,73 @@
+;
+; Sample ceph cluster.conf file.
+;
+; This file defines cluster membership and the various locations
+; that Ceph stores data.
+;
+; NOTE: This file ONLY includes options relating to starting and
+; stopping ceph daemons.  For runtime options, see ceph.conf.
+
+; If a 'host' is defined for a daemon, the start/stop script will
+; verify that it matches the hostname (or else ignore it).  If it is
+; not defined, it is assumed that the daemon is intended to start on
+; the current host (e.g., in a setup with a startup.conf on each
+; node).
+
+; global
+[global]
+        conf file = ceph.conf
+	restart on core dump = true
+
+; monitor
+[mon]
+	pid file = /var/run/ceph/mon$mon.pid
+
+[mon0]
+	host = alpha
+	mon path = /data/mon0
+	mon addr = 192.168.0.10:6789
+
+[mon1]
+	host = beta
+	mon path = /data/mon1
+	mon addr = 192.168.0.11:6789
+
+[mon2]
+	host = gamma
+	mon path = /data/mon2
+	mon addr = 192.168.0.12:6789
+
+; mds
+[mds]
+	pid file = /var/run/ceph/mds$mds.pid
+
+[mds0]
+	host = alpha
+	
+
+; osd
+[osd]
+	pid file = /var/run/ceph/osd$osd.pid
+	sudo = true
+
+[osd0]
+	host = alpha
+	osd dev = /dev/sdx
+	osd journal = /dev/umema
+
+[osd1]
+	host = alpha
+	osd dev = /dev/sdy
+	osd journal = /dev/umema
+
+[osd2]
+	host = beta
+	osd dev = /dev/sdx
+	osd journal = /dev/umema
+
+[osd3]
+	host = beta
+	osd dev = /dev/sdy
+	osd journal = /dev/umema
+
+
diff --git a/src/sample.startup.conf b/src/sample.startup.conf
deleted file mode 100644
index cc5e29808df1..000000000000
--- a/src/sample.startup.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-;
-; Sample ceph startup.conf file.
-;
-
-; NOTE: This file ONLY includes options relating to starting and
-; stopping ceph daemons.  For runtime options, see ceph.conf.
-
-; If a 'host' is defined for a daemon, the start/stop script will
-; verify that it matches the hostname (or else ignore it).  If it is
-; not defined, it is assumed that the daemon is intended to start on
-; the current host (e.g., in a setup with a startup.conf on each
-; node).
-
-
-; global
-[global]
-        conf file = ceph.conf
-	restart on core dump = true
-
-; monitor
-[mon]
-	pid file = /var/run/ceph/mon$mon.pid
-
-[mon0]
-	host = alpha
-	mon path = /data/mon0
-	mon addr = 192.168.0.10:6789
-
-[mon1]
-	host = beta
-	mon path = /data/mon1
-	mon addr = 192.168.0.11:6789
-
-[mon2]
-	host = gamma
-	mon path = /data/mon2
-	mon addr = 192.168.0.12:6789
-
-; mds
-[mds]
-	pid file = /var/run/ceph/mds$mds.pid
-
-[mds0]
-	host = alpha
-	
-
-; osd
-[osd]
-	pid file = /var/run/ceph/osd$osd.pid
-	sudo = true
-
-[osd0]
-	host = alpha
-	osd dev = /dev/sdx
-	osd journal = /dev/umema
-
-[osd1]
-	host = alpha
-	osd dev = /dev/sdy
-	osd journal = /dev/umema
-
-[osd2]
-	host = beta
-	osd dev = /dev/sdx
-	osd journal = /dev/umema
-
-[osd3]
-	host = beta
-	osd dev = /dev/sdy
-	osd journal = /dev/umema
-
-