From c72aeffbc5ca28e0feedee69051bb99314511cb7 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Wed, 11 Mar 2009 16:09:46 -0700 Subject: [PATCH] config: fix cosd conf files --- src/cosd.ceph.conf | 36 +++++++++++++++++++++++++++++++++--- src/cosd.cluster.conf | 35 ----------------------------------- 2 files changed, 33 insertions(+), 38 deletions(-) delete mode 100644 src/cosd.cluster.conf diff --git a/src/cosd.ceph.conf b/src/cosd.ceph.conf index 41215bccab36f..a7c0110e9c1bb 100644 --- a/src/cosd.ceph.conf +++ b/src/cosd.ceph.conf @@ -1,9 +1,39 @@ -; runtime options - [global] + pid file = /home/sage/ceph/src/out/$name.pid logger dir = /home/sage/ceph/src/log log dir = /home/sage/ceph/src/out log sym dir = /home/sage/ceph/src/out - monmap file = /home/sage/ceph/src/mondata/mon0/monmap/1 + chdir = /home/sage/ceph/src + restart on core dump = false + +[mon] +[mon0] + host = cosd0 + mon addr = 10.3.14.95:6789 + mon data = /home/sage/ceph/src/mondata/mon$num + +[osd] + osd data = /home/sage/ceph/src/devm/$name + +[osd1] + host = cosd1 + btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-4:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-5:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-6:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-7:0:0:0" +[osd2] + host = cosd2 + btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-4:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-5:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-6:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-7:0:0:0" + +[osd3] + host = cosd3 + btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-4:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-5:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-6:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-7:0:0:0" +[osd4] + host = cosd4 + btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-4:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-5:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-6:0:0:0" +[osd5] + host = cosd5 + btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-4:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-5:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-6:0:0:0" +[mds.foo] + host = cosd0 +[mds.bar] + host = cosd0 \ No newline at end of file diff --git a/src/cosd.cluster.conf b/src/cosd.cluster.conf deleted file mode 100644 index 7a3e639dd336f..0000000000000 --- a/src/cosd.cluster.conf +++ /dev/null @@ -1,35 +0,0 @@ -[global] - pid file = /home/sage/ceph/src/out/$name.pid - restart on core dump = false - conf = /home/sage/ceph/src/cosd.ceph.conf - -[mon] -[mon0] - host = cosd0 - mon addr = 10.3.14.95:6789 - mon data = /home/sage/ceph/src/mondata/mon$num - -[osd] - osd data = /home/sage/ceph/src/devm/$name - -[osd1] - host = cosd1 - btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-4:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-5:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-6:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-7:0:0:0" -[osd2] - host = cosd2 - btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-2:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-4:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-5:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-6:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-7:0:0:0" - -[osd3] - host = cosd3 - btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-4:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-5:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-6:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-7:0:0:0" -[osd4] - host = cosd4 - btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-4:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-5:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-6:0:0:0" -[osd5] - host = cosd5 - btrfs devs = "/dev/disk/by-path/pci-0000:05:01.0-scsi-3:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-4:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-5:0:0:0 /dev/disk/by-path/pci-0000:05:01.0-scsi-6:0:0:0" - -[mds.foo] - host = cosd0 -[mds.bar] - host = cosd0 \ No newline at end of file -- 2.39.5