From ff0a44bb81708ba704c2d43e61d84332f9658211 Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Fri, 16 Nov 2012 16:32:23 -0800 Subject: [PATCH] upstart: make ceph-osd-all, ceph jobs This will let you start/stop all daemons. Signed-off-by: Sage Weil --- src/Makefile.am | 2 ++ src/upstart/ceph-mds-all-starter.conf | 2 +- src/upstart/ceph-mds-all.conf | 4 ++-- src/upstart/ceph-mon-all-starter.conf | 2 +- src/upstart/ceph-mon-all.conf | 4 ++-- src/upstart/ceph-osd-all.conf | 4 ++++ src/upstart/ceph-osd.conf | 2 +- src/upstart/ceph.conf | 4 ++++ src/upstart/radosgw-all-starter.conf | 2 +- src/upstart/radosgw-all.conf | 4 ++-- 10 files changed, 20 insertions(+), 10 deletions(-) create mode 100644 src/upstart/ceph-osd-all.conf create mode 100644 src/upstart/ceph.conf diff --git a/src/Makefile.am b/src/Makefile.am index 9ea28ee23877a..cfb1140783e76 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1067,11 +1067,13 @@ EXTRA_DIST += \ $(ceph_tool_gui_DATA) \ $(srcdir)/test/encoding/readable.sh \ $(srcdir)/test/encoding/check-generated.sh \ + $(srcdir)/upstart/ceph.conf \ $(srcdir)/upstart/ceph-mon.conf \ $(srcdir)/upstart/ceph-mon-all.conf \ $(srcdir)/upstart/ceph-mon-all-starter.conf \ $(srcdir)/upstart/ceph-create-keys.conf \ $(srcdir)/upstart/ceph-osd.conf \ + $(srcdir)/upstart/ceph-osd-all.conf \ $(srcdir)/upstart/ceph-hotplug.conf \ $(srcdir)/upstart/ceph-mds.conf \ $(srcdir)/upstart/ceph-mds-all.conf \ diff --git a/src/upstart/ceph-mds-all-starter.conf b/src/upstart/ceph-mds-all-starter.conf index 2748f35c93a53..fe7e2bd32ad03 100644 --- a/src/upstart/ceph-mds-all-starter.conf +++ b/src/upstart/ceph-mds-all-starter.conf @@ -1,7 +1,7 @@ description "Ceph MDS (task to start all instances)" start on starting ceph-mds-all -stop on runlevel [!2345] +stop on runlevel [!2345] or stopping ceph-mds-all task diff --git a/src/upstart/ceph-mds-all.conf b/src/upstart/ceph-mds-all.conf index 0b58f5f8a60a7..c9da72ec02311 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 (local-filesystems and net-device-up IFACE!=lo) -stop on runlevel [!2345] +start on starting ceph +stop on stopping ceph diff --git a/src/upstart/ceph-mon-all-starter.conf b/src/upstart/ceph-mon-all-starter.conf index f7188cb740532..7101a8acca98f 100644 --- a/src/upstart/ceph-mon-all-starter.conf +++ b/src/upstart/ceph-mon-all-starter.conf @@ -1,7 +1,7 @@ description "Ceph MON (start all instances)" start on starting ceph-mon-all -stop on runlevel [!2345] +stop on runlevel [!2345] or stopping ceph-mon-all task diff --git a/src/upstart/ceph-mon-all.conf b/src/upstart/ceph-mon-all.conf index 006f2f2074505..10c17eab68960 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 (local-filesystems and net-device-up IFACE!=lo) -stop on runlevel [!2345] +start on starting ceph +stop on runlevel [!2345] or stopping ceph diff --git a/src/upstart/ceph-osd-all.conf b/src/upstart/ceph-osd-all.conf new file mode 100644 index 0000000000000..eb379c3d094fa --- /dev/null +++ b/src/upstart/ceph-osd-all.conf @@ -0,0 +1,4 @@ +description "Ceph OSD (all instances)" + +start on starting ceph +stop on runlevel [!2345] or stopping ceph diff --git a/src/upstart/ceph-osd.conf b/src/upstart/ceph-osd.conf index 9bbb91cb6a57d..5f6868769f66f 100644 --- a/src/upstart/ceph-osd.conf +++ b/src/upstart/ceph-osd.conf @@ -1,7 +1,7 @@ description "Ceph OSD" start on ceph-osd -stop on runlevel [!2345] +stop on runlevel [!2345] or stopping ceph-osd-all respawn respawn limit 5 30 diff --git a/src/upstart/ceph.conf b/src/upstart/ceph.conf new file mode 100644 index 0000000000000..d129defad7a1c --- /dev/null +++ b/src/upstart/ceph.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/radosgw-all-starter.conf b/src/upstart/radosgw-all-starter.conf index d3cabcf4ee3b8..b9357a38fdf27 100644 --- a/src/upstart/radosgw-all-starter.conf +++ b/src/upstart/radosgw-all-starter.conf @@ -1,7 +1,7 @@ description "Ceph radosgw (task to start all instances)" start on starting radosgw-all -stop on runlevel [!2345] +stop on runlevel [!2345] or stopping radosgw-all task diff --git a/src/upstart/radosgw-all.conf b/src/upstart/radosgw-all.conf index 2f2e27f9d51b5..af2b84d24f8f1 100644 --- a/src/upstart/radosgw-all.conf +++ b/src/upstart/radosgw-all.conf @@ -1,4 +1,4 @@ description "Ceph radosgw (all instances)" -start on (local-filesystems and net-device-up IFACE!=lo) -stop on runlevel [!2345] +start on starting ceph +stop on runlevel [!2345] or stopping ceph -- 2.39.5