summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSage Weil <sage@inktank.com>2012-12-14 13:40:58 -0800
committerSage Weil <sage@inktank.com>2012-12-14 13:49:26 -0800
commit96f40b146b28d817b4d7c48a65d25de2e843c11e (patch)
tree18968ef28ecc0d878794e888f1550e3e9dc65010
parente597482f2941ec80e3159610fc84a674701b48fd (diff)
downloadceph-96f40b146b28d817b4d7c48a65d25de2e843c11e.tar.gz
upstart: make starter jobs consistent
Signed-off-by: Sage Weil <sage@inktank.com>
-rw-r--r--src/upstart/ceph-mds-all-starter.conf2
-rw-r--r--src/upstart/ceph-osd-all-starter.conf1
2 files changed, 1 insertions, 2 deletions
diff --git a/src/upstart/ceph-mds-all-starter.conf b/src/upstart/ceph-mds-all-starter.conf
index ef24995325e..8e7540331ba 100644
--- a/src/upstart/ceph-mds-all-starter.conf
+++ b/src/upstart/ceph-mds-all-starter.conf
@@ -1,4 +1,4 @@
-description "Ceph MDS (task to start all instances)"
+description "Ceph MDS (start all instances)"
start on starting ceph-mds-all
stop on runlevel [!2345] or stopping ceph-mds-all
diff --git a/src/upstart/ceph-osd-all-starter.conf b/src/upstart/ceph-osd-all-starter.conf
index 4fd5a2a5125..616f02ada6e 100644
--- a/src/upstart/ceph-osd-all-starter.conf
+++ b/src/upstart/ceph-osd-all-starter.conf
@@ -13,7 +13,6 @@ script
if [ -e "/var/lib/ceph/osd/$f/ready" ] && [ -e "/var/lib/ceph/osd/$f/upstart" ]; then
cluster="${f%%-*}"
id="${f#*-}"
-
initctl emit ceph-osd cluster="$cluster" id="$id"
fi
done