From: Sage Weil Date: Thu, 6 Dec 2012 13:26:01 +0000 (-0800) Subject: upstart: rename ceph -> ceph-all X-Git-Tag: v0.55.1~9 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=47266cdaecaa3b0dad2034dca0e232d67fd2a78d;p=ceph.git upstart: rename ceph -> ceph-all This avoids a conflict with the sysvinit job. Signed-off-by: Sage Weil --- diff --git a/src/Makefile.am b/src/Makefile.am index be851d69f55e..193dfdaebb35 100644 --- 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 index 000000000000..d129defad7a1 --- /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 c9da72ec0231..991019e14583 100644 --- 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 10c17eab6896..aea00c4d1f76 100644 --- 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 eb379c3d094f..73d3b37e7c8e 100644 --- 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 index d129defad7a1..000000000000 --- 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 af2b84d24f8f..66107520496d 100644 --- 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