Remove upstart files and references

Nautilus is not supported on any distros still running upstart so these are redundant. Signed-off-by: Brad Hubbard <[email protected]>
blmt · Aug 20, 2018 · 2c755ce · 2c755ce
1 parent c1a43ca
commit 2c755ce
Show file tree

Hide file tree

Showing 24 changed files with 3 additions and 401 deletions.
diff --git a/PendingReleaseNotes b/PendingReleaseNotes
@@ -5,6 +5,9 @@
   'ceph osd destroy' or 'ceph osd purge' (but after first confirming it is
   safe to do so via the 'ceph osd safe-to-destroy' command).
 
+* Nautilus is not supported on any distros still running upstart so upstart
+  specific files and references have been removed.
+
 >=13.1.0
 --------
 

diff --git a/debian/rules b/debian/rules
@@ -67,24 +67,6 @@ override_dh_installlogrotate:
 	dh_installlogrotate -pceph-common
 
 override_dh_installinit:
-	# dh_installinit is only set up to handle one upstart script
-	# per package, so do this ourselves
-	install -d -m0755 debian/ceph-base/etc/init
-	install -m0644 src/upstart/ceph-all.conf debian/ceph-base/etc/init
-	install -d -m0755 debian/ceph-osd/etc/init
-	install -m0644 src/upstart/ceph-osd*.conf debian/ceph-osd/etc/init
-	install -d -m0755 debian/ceph-mon/etc/init
-	install -m0644 src/upstart/ceph-mon*.conf debian/ceph-mon/etc/init
-	install -d -m0755 debian/ceph-common/etc/init
-	install -m0644 src/upstart/rbdmap.conf debian/ceph-common/etc/init
-	install -d -m0755 debian/ceph-mds/etc/init
-	install -m0644 src/upstart/ceph-mds*.conf debian/ceph-mds/etc/init
-	install -d -m0755 debian/ceph-mgr/etc/init
-	install -m0644 src/upstart/ceph-mgr*.conf debian/ceph-mgr/etc/init
-	install -d -m0755 debian/radosgw/etc/init
-	install -m0644 src/upstart/radosgw*.conf debian/radosgw/etc/init
-	install -d -m0755 debian/rbd-mirror/etc/init
-	install -m0644 src/upstart/ceph-rbd-mirror*.conf debian/rbd-mirror/etc/init
 	# install the systemd stuff manually since we have funny service names
 	install -d -m0755 debian/ceph-common/etc/default
 	install -m0644 etc/default/ceph debian/ceph-common/etc/default/

diff --git a/doc/install/manual-deployment.rst b/doc/install/manual-deployment.rst
@@ -240,31 +240,13 @@ The procedure is as follows:
 	osd pool default pgp num = 333
 	osd crush chooseleaf type = 1
 
-#. Touch the ``done`` file.
-
-   Mark that the monitor is created and ready to be started::
-
-	sudo touch /var/lib/ceph/mon/ceph-node1/done
 
 #. Start the monitor(s).
 
    For most distributions, services are started via systemd now::
 
 	sudo systemctl start ceph-mon@node1
 
-   For Ubuntu Trusty, use Upstart::
-
-	sudo start ceph-mon id=node1 [cluster={cluster-name}]
-
-   In this case, to allow the start of the daemon at each reboot you
-   must create two empty files like this::
-
-	sudo touch /var/lib/ceph/mon/{cluster-name}-{hostname}/upstart
-
-   For example::
-
-	sudo touch /var/lib/ceph/mon/ceph-node1/upstart
-
    For older Debian/CentOS/RHEL, use sysvinit::
 
 	sudo /etc/init.d/ceph start mon.node1

diff --git a/doc/rados/operations/operating.rst b/doc/rados/operations/operating.rst
@@ -97,21 +97,6 @@ For example::
 
 
 
-Running Ceph with Upstart
-=========================
-
-When deploying Ceph with ``ceph-deploy`` on Ubuntu Trusty, you may start and
-stop Ceph daemons on a :term:`Ceph Node` using the event-based `Upstart`_.
-Upstart does not require you to define daemon instances in the Ceph
-configuration file.
-
-To list the Ceph Upstart jobs and instances on a node, execute:: 
-
-	sudo initctl list | grep ceph
-
-See `initctl`_ for additional details.
-
-
 Starting all Daemons
 --------------------
 
@@ -247,5 +232,4 @@ include:
 
 
 .. _Valgrind: http://www.valgrind.org/
-.. _Upstart: http://upstart.ubuntu.com/index.html
 .. _initctl: http://manpages.ubuntu.com/manpages/raring/en/man8/initctl.8.html
diff --git a/src/upstart/ceph-all.conf b/src/upstart/ceph-all.conf
diff --git a/src/upstart/ceph-mds-all-starter.conf b/src/upstart/ceph-mds-all-starter.conf
diff --git a/src/upstart/ceph-mds-all.conf b/src/upstart/ceph-mds-all.conf
diff --git a/src/upstart/ceph-mds.conf b/src/upstart/ceph-mds.conf
diff --git a/src/upstart/ceph-mgr-all-starter.conf b/src/upstart/ceph-mgr-all-starter.conf
diff --git a/src/upstart/ceph-mgr-all.conf b/src/upstart/ceph-mgr-all.conf
diff --git a/src/upstart/ceph-mgr.conf b/src/upstart/ceph-mgr.conf
diff --git a/src/upstart/ceph-mon-all-starter.conf b/src/upstart/ceph-mon-all-starter.conf
diff --git a/src/upstart/ceph-mon-all.conf b/src/upstart/ceph-mon-all.conf
diff --git a/src/upstart/ceph-mon.conf b/src/upstart/ceph-mon.conf
diff --git a/src/upstart/ceph-osd-all-starter.conf b/src/upstart/ceph-osd-all-starter.conf
diff --git a/src/upstart/ceph-osd-all.conf b/src/upstart/ceph-osd-all.conf
diff --git a/src/upstart/ceph-osd.conf b/src/upstart/ceph-osd.conf
diff --git a/src/upstart/ceph-rbd-mirror-all-starter.conf b/src/upstart/ceph-rbd-mirror-all-starter.conf
diff --git a/src/upstart/ceph-rbd-mirror-all.conf b/src/upstart/ceph-rbd-mirror-all.conf
diff --git a/src/upstart/ceph-rbd-mirror.conf b/src/upstart/ceph-rbd-mirror.conf
diff --git a/src/upstart/radosgw-all-starter.conf b/src/upstart/radosgw-all-starter.conf
diff --git a/src/upstart/radosgw-all.conf b/src/upstart/radosgw-all.conf