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.

diff --git a/src/upstart/ceph-create-keys.conf b/src/upstart/ceph-create-keys.conf
index de215d98ff347ef57460837bd638c14bf4dc0dda..6fb4581852fde313b87fcfd0f2b8649743381903 100644 (file)
--- 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 817f34120ec91a2a2d07eb4b290d4f0d880269c3..702045293a2d84785f5829c3a8c3389d1dd5ac69 100644 (file)
--- 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 2db18124cb4a60967873009a1b2f1103fb4b860d..2748f35c93a5398612f999dd8f169f4b554b9805 100644 (file)
--- 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 b20bcb8ab75c3ed7d45e7f1c2d63ce5d81eddeb2..f7188cb740532714cb9ddedb86b94a08b4ceb6ed 100644 (file)
--- 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 ceb4a885a1842e95d22a40323c3e28aa9bab56b7..d3cabcf4ee3b8d52e92ca5c0cd43c05ed9a9e90e 100644 (file)
--- 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