doc/rados/operations: Remove upstart

Followup on 2c755cef6935e2ebf356711861c5ff0378f33dd7

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>

diff --git a/doc/rados/operations/add-or-rm-osds.rst b/doc/rados/operations/add-or-rm-osds.rst
index 3361587acedb0a79f7e6fbb7b6ad97fa96b74806..9213c4bc735cef1e221dd81c6e405c97c68edb44 100644 (file)
--- a/doc/rados/operations/add-or-rm-osds.rst
+++ b/doc/rados/operations/add-or-rm-osds.rst
@@ -174,13 +174,7 @@ After you add an OSD to Ceph, the OSD is in your configuration. However,
 it is not yet running. The OSD is ``down`` and ``in``. You must start
 your new OSD before it can begin receiving data. You may use
 ``service ceph`` from your admin host or start the OSD from its host
-machine.
-
-For Ubuntu Trusty use Upstart. ::
-
-       sudo start ceph-osd id={osd-num}
-
-For all other distros use systemd. ::
+machine::
 
        sudo systemctl start ceph-osd@{osd-num}
 

diff --git a/doc/rados/operations/operating.rst b/doc/rados/operations/operating.rst
index ab10990f39ba25fef1a168e1e1a44bf8f08d506b..5a9353fdb448eaed10ca128b9dc0cabe71b4bdee 100644 (file)
--- a/doc/rados/operations/operating.rst
+++ b/doc/rados/operations/operating.rst
@@ -93,85 +93,6 @@ For example::
        sudo systemctl stop ceph-mds@ceph-server
 
 
-.. index:: Upstart; operating a cluster
-
-Running Ceph with Upstart
-==========================
-
-Starting all Daemons
---------------------
-
-To start all daemons on a Ceph Node (irrespective of type), execute the
-following:: 
-
-       sudo start ceph-all
-       
-
-Stopping all Daemons   
---------------------
-
-To stop all daemons on a Ceph Node (irrespective of type), execute the
-following:: 
-
-       sudo stop ceph-all
-       
-
-Starting all Daemons by Type
-----------------------------
-
-To start all daemons of a particular type on a Ceph Node, execute one of the
-following:: 
-
-       sudo start ceph-osd-all
-       sudo start ceph-mon-all
-       sudo start ceph-mds-all
-
-
-Stopping all Daemons by Type
-----------------------------
-
-To stop all daemons of a particular type on a Ceph Node, execute one of the
-following::
-
-       sudo stop ceph-osd-all
-       sudo stop ceph-mon-all
-       sudo stop ceph-mds-all
-
-
-Starting a Daemon
------------------
-
-To start a specific daemon instance on a Ceph Node, execute one of the
-following:: 
-
-       sudo start ceph-osd id={id}
-       sudo start ceph-mon id={hostname}
-       sudo start ceph-mds id={hostname}
-
-For example:: 
-
-       sudo start ceph-osd id=1
-       sudo start ceph-mon id=ceph-server
-       sudo start ceph-mds id=ceph-server
-
-
-Stopping a Daemon
------------------
-
-To stop a specific daemon instance on a Ceph Node, execute one of the
-following:: 
-
-       sudo stop ceph-osd id={id}
-       sudo stop ceph-mon id={hostname}
-       sudo stop ceph-mds id={hostname}
-
-For example:: 
-
-       sudo stop ceph-osd id=1
-       sudo start ceph-mon id=ceph-server
-       sudo start ceph-mds id=ceph-server
-
-
 .. index:: sysvinit; operating a cluster
 
 Running Ceph with sysvinit

diff --git a/doc/start/os-recommendations.rst b/doc/start/os-recommendations.rst
index cef6b366fd2bd684813a07901defe77cfac395a9..ee5c6442d642145f5ad9a796d10d6aa9db14c80a 100644 (file)
--- a/doc/start/os-recommendations.rst
+++ b/doc/start/os-recommendations.rst
@@ -39,7 +39,7 @@ Platforms
 The charts below show how Ceph's requirements map onto various Linux
 platforms.  Generally speaking, there is very little dependence on
 specific distributions aside from the kernel and system initialization
-package (i.e., sysvinit, upstart, systemd).
+package (i.e., sysvinit, systemd).
 
 Octopus (15.2.z)
 -----------------