upstart: rename ceph -> ceph-all

This avoids a conflict with the sysvinit job.

Signed-off-by: Sage Weil <sage@inktank.com>

diff --git a/src/Makefile.am b/src/Makefile.am
index be851d69f55e83bdf6201d40fa3f93aa70c1d27e..193dfdaebb35ac4a8fc2c1292c8ba61b892c4b3b 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1080,7 +1080,7 @@ EXTRA_DIST += \
        $(ceph_tool_gui_DATA) \
        $(srcdir)/test/encoding/readable.sh \
        $(srcdir)/test/encoding/check-generated.sh \
-       $(srcdir)/upstart/ceph.conf \
+       $(srcdir)/upstart/ceph-all.conf \
        $(srcdir)/upstart/ceph-mon.conf \
        $(srcdir)/upstart/ceph-mon-all.conf \
        $(srcdir)/upstart/ceph-mon-all-starter.conf \

diff --git a/src/upstart/ceph-all.conf b/src/upstart/ceph-all.conf
new file mode 100644 (file)
index 0000000..d129def
--- /dev/null
+++ b/src/upstart/ceph-all.conf
@@ -0,0 +1,4 @@
+description "Ceph"
+
+start on (local-filesystems and net-device-up IFACE!=lo)
+stop on runlevel [!2345]

diff --git a/src/upstart/ceph-mds-all.conf b/src/upstart/ceph-mds-all.conf
index c9da72ec023119059b13fdb6418938b8e42e3ca2..991019e14583d7bc8c9366092cb02967973cc482 100644 (file)
--- a/src/upstart/ceph-mds-all.conf
+++ b/src/upstart/ceph-mds-all.conf
@@ -1,4 +1,4 @@
 description "Ceph MDS (all instances)"
 
-start on starting ceph
-stop on stopping ceph
+start on starting ceph-all
+stop on stopping ceph-all

diff --git a/src/upstart/ceph-mon-all.conf b/src/upstart/ceph-mon-all.conf
index 10c17eab68960437e749fe991f15262c7dd267af..aea00c4d1f766816de0fa72128719589b0d847cc 100644 (file)
--- a/src/upstart/ceph-mon-all.conf
+++ b/src/upstart/ceph-mon-all.conf
@@ -1,4 +1,4 @@
 description "Ceph monitor (all instances)"
 
-start on starting ceph
-stop on runlevel [!2345] or stopping ceph
+start on starting ceph-all
+stop on runlevel [!2345] or stopping ceph-all

diff --git a/src/upstart/ceph-osd-all.conf b/src/upstart/ceph-osd-all.conf
index eb379c3d094fa23fc558444211575c8adf145bc9..73d3b37e7c8ed50ca939f6688ffb3eb226bdd562 100644 (file)
--- a/src/upstart/ceph-osd-all.conf
+++ b/src/upstart/ceph-osd-all.conf
@@ -1,4 +1,4 @@
 description "Ceph OSD (all instances)"
 
-start on starting ceph
-stop on runlevel [!2345] or stopping ceph
+start on starting ceph-all
+stop on runlevel [!2345] or stopping ceph-all

diff --git a/src/upstart/ceph.conf b/src/upstart/ceph.conf
deleted file mode 100644 (file)
index d129def..0000000
--- a/src/upstart/ceph.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-description "Ceph"
-
-start on (local-filesystems and net-device-up IFACE!=lo)
-stop on runlevel [!2345]

diff --git a/src/upstart/radosgw-all.conf b/src/upstart/radosgw-all.conf
index af2b84d24f8f1a6d70f5926ca21fceeed737b1de..66107520496d444b523b17bcaa520fa3313d3797 100644 (file)
--- a/src/upstart/radosgw-all.conf
+++ b/src/upstart/radosgw-all.conf
@@ -1,4 +1,4 @@
 description "Ceph radosgw (all instances)"
 
-start on starting ceph
-stop on runlevel [!2345] or stopping ceph
+start on starting ceph-all
+stop on runlevel [!2345] or stopping ceph-all