diff options
author | Tommi Virtanen <tv@inktank.com> | 2012-09-11 16:31:57 -0700 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2012-09-11 16:58:39 -0700 |
commit | 771ca71c0357bd8149677795ac934ab09945a3a3 (patch) | |
tree | 371b8cfb8c6e97d10d0feb1f11b76a0e4c288113 /src/upstart | |
parent | 9f967e3ac255b0037b598061f5cbb4050db79472 (diff) | |
download | ceph-771ca71c0357bd8149677795ac934ab09945a3a3.tar.gz |
upstart: Give everything a stop on stanza.
These are all tasks, and expected to exit somewhat quickly,
but e.g. ceph-create-keys has a loop where it waits for mon
to reach quorum, so it might still be in that loop when the
machine is shut down.
Diffstat (limited to 'src/upstart')
-rw-r--r-- | src/upstart/ceph-create-keys.conf | 1 | ||||
-rw-r--r-- | src/upstart/ceph-hotplug.conf | 1 | ||||
-rw-r--r-- | src/upstart/ceph-mds-all-starter.conf | 1 | ||||
-rw-r--r-- | src/upstart/ceph-mon-all-starter.conf | 1 | ||||
-rw-r--r-- | src/upstart/radosgw-all-starter.conf | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/src/upstart/ceph-create-keys.conf b/src/upstart/ceph-create-keys.conf index de215d98ff3..6fb4581852f 100644 --- a/src/upstart/ceph-create-keys.conf +++ b/src/upstart/ceph-create-keys.conf @@ -1,6 +1,7 @@ description "Create Ceph client.admin key when possible" start on started ceph-mon +stop on runlevel [!2345] task diff --git a/src/upstart/ceph-hotplug.conf b/src/upstart/ceph-hotplug.conf index 817f34120ec..702045293a2 100644 --- a/src/upstart/ceph-hotplug.conf +++ b/src/upstart/ceph-hotplug.conf @@ -3,6 +3,7 @@ description "Ceph hotplug" start on block-device-added \ DEVTYPE=partition \ ID_PART_ENTRY_TYPE=4fbd7e29-9d25-41b8-afd0-062c0ceff05d +stop on runlevel [!2345] task instance $DEVNAME diff --git a/src/upstart/ceph-mds-all-starter.conf b/src/upstart/ceph-mds-all-starter.conf index 2db18124cb4..2748f35c93a 100644 --- a/src/upstart/ceph-mds-all-starter.conf +++ b/src/upstart/ceph-mds-all-starter.conf @@ -1,6 +1,7 @@ description "Ceph MDS (task to start all instances)" start on starting ceph-mds-all +stop on runlevel [!2345] task diff --git a/src/upstart/ceph-mon-all-starter.conf b/src/upstart/ceph-mon-all-starter.conf index b20bcb8ab75..f7188cb7405 100644 --- a/src/upstart/ceph-mon-all-starter.conf +++ b/src/upstart/ceph-mon-all-starter.conf @@ -1,6 +1,7 @@ description "Ceph MON (start all instances)" start on starting ceph-mon-all +stop on runlevel [!2345] task diff --git a/src/upstart/radosgw-all-starter.conf b/src/upstart/radosgw-all-starter.conf index ceb4a885a18..d3cabcf4ee3 100644 --- a/src/upstart/radosgw-all-starter.conf +++ b/src/upstart/radosgw-all-starter.conf @@ -1,6 +1,7 @@ description "Ceph radosgw (task to start all instances)" start on starting radosgw-all +stop on runlevel [!2345] task |