upstart: start radosgw-all according to runlevel

Prior to this change, the radosgw-all service depended on the ceph-all
service in order to trigger a start operation. ceph-all.conf ships in
the ceph-base package. This means that "radosgw-all" Upstart service
would not start on boot unless the "ceph-base" package was also
installed.

Break this dependency by starting radosgw-all according to the system's
runlevel, rather than only listening for the ceph-all starting signal.

This change causes RGW to start on boot even when ceph-base is not
installed.

Preserve the original "on starting ceph-all" condition here as well, so
that users can still start RGW with the documented "start ceph-all"
command.

(Note: This has the side effect that if a user has a "ceph-all.override
-> manual" file on their system because they intentionally wanted to
prevent all Ceph-related services from starting during boot, RGW will
still start on boot when it did not previously. Users will need to
explicitly create a "radosgw-all.override -> manual" file as well if
they want to prevent RGW from starting on boot.)

Fixes: http://tracker.ceph.com/issues/18313
Signed-off-by: Ken Dreyer <kdreyer@redhat.com>
(cherry picked from commit 230b9d5c5603809367eb21df9b9b129394b220c0)

diff --git a/src/upstart/radosgw-all.conf b/src/upstart/radosgw-all.conf
index 66107520496d444b523b17bcaa520fa3313d3797..9067113ae944c56f6adab69c30e4665274a5bc34 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-all
+start on starting ceph-all or runlevel [2345]
 stop on runlevel [!2345] or stopping ceph-all