doc: rm SysV instructions, add systemd

Signed-off-by: Ken Dreyer <kdreyer@redhat.com>

diff --git a/doc/rados/operations/add-or-rm-osds.rst b/doc/rados/operations/add-or-rm-osds.rst
index 3efe5da7c55f7ece4dc36cdd0ba6ab618d1bf70a..d82add3b90c3a942db541fe4dc747026a92e2efe 100644 (file)
--- a/doc/rados/operations/add-or-rm-osds.rst
+++ b/doc/rados/operations/add-or-rm-osds.rst
@@ -174,13 +174,13 @@ 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 Debian/Ubuntu use Upstart. ::
+For Ubuntu Trusty use Upstart. ::
 
        sudo start ceph-osd id={osd-num}
 
-For CentOS/RHEL, use sysvinit. ::
+For all other distros use systemd. ::
 
-       sudo /etc/init.d/ceph start osd.{osd-num}
+       sudo systemctl start ceph-osd@{osd-num}
 
 
 Once you start your OSD, it is ``up`` and ``in``.
@@ -274,7 +274,7 @@ That is, the OSD may be ``up`` and ``out``. You must stop
 your OSD before you remove it from the configuration. :: 
 
        ssh {osd-host}
-       sudo /etc/init.d/ceph stop osd.{osd-num}
+       sudo systemctl stop ceph-osd@{osd-num}
 
 Once you stop your OSD, it is ``down``. 
 

diff --git a/doc/rados/operations/monitoring-osd-pg.rst b/doc/rados/operations/monitoring-osd-pg.rst
index 9e1e0bd489ef7991273814108bdba9d7fcddc68f..e565fb719603847858f0aa6b8d94a0c30da367f5 100644 (file)
--- a/doc/rados/operations/monitoring-osd-pg.rst
+++ b/doc/rados/operations/monitoring-osd-pg.rst
@@ -93,7 +93,7 @@ daemons that aren't running::
 
 If an OSD is ``down``, start it:: 
 
-       sudo /etc/init.d/ceph -a start osd.1
+       sudo systemctl start ceph-osd@1
 
 See `OSD Not Running`_ for problems associated with OSDs that stopped, or won't
 restart.

diff --git a/doc/rados/operations/operating.rst b/doc/rados/operations/operating.rst
index fd8a4cb015319a8972692a096d430c6de7d1b240..972c3d7f089a496eadaaa93af17234d6e7d93fd7 100644 (file)
--- a/doc/rados/operations/operating.rst
+++ b/doc/rados/operations/operating.rst
@@ -2,15 +2,108 @@
  Operating a Cluster
 =====================
 
-.. index:: Upstart; operating a cluster
+.. index:: systemd; operating a cluster
+
+
+Running Ceph with systemd
+==========================
+
+For all distributions that support systemd (CentOS 7, Fedora, Debian Jessie
+8.x, SUSE), ceph daemons are now managed using native systemd files instead of
+the legacy sysvinit scripts.  For example::
+
+        sudo systemctl start ceph.target       # start all daemons
+        sudo systemctl status ceph-osd@12      # check status of osd.12
+
+To list the Ceph systemd units on a node, execute::
+
+        sudo systemctl status ceph\*.service ceph\*.target
+
+Starting all Daemons
+--------------------
+
+To start all daemons on a Ceph Node (irrespective of type), execute the
+following::
+
+       sudo systemctl start ceph.target
+
+
+Stopping all Daemons
+--------------------
+
+To stop all daemons on a Ceph Node (irrespective of type), execute the
+following::
+
+        sudo systemctl stop ceph\*.service ceph\*.target
+
+
+Starting all Daemons by Type
+----------------------------
+
+To start all daemons of a particular type on a Ceph Node, execute one of the
+following::
+
+        sudo systemctl start ceph-osd.target
+        sudo systemctl start ceph-mon.target
+        sudo systemctl start ceph-mds.target
+
+
+Stopping all Daemons by Type
+----------------------------
+
+To stop all daemons of a particular type on a Ceph Node, execute one of the
+following::
+
+        sudo systemctl stop ceph-mon\*.service ceph-mon.target
+        sudo systemctl stop ceph-osd\*.service ceph-osd.target
+        sudo systemctl stop ceph-mds\*.service ceph-mds.target
+
+
+Starting a Daemon
+-----------------
+
+To start a specific daemon instance on a Ceph Node, execute one of the
+following::
+
+       sudo systemctl start ceph-osd@{id}
+       sudo systemctl start ceph-mon@{hostname}
+       sudo systemctl start ceph-mds@{hostname}
+
+For example::
+
+       sudo systemctl start ceph-osd@1
+       sudo systemctl start ceph-mon@ceph-server
+       sudo systemctl start ceph-mds@ceph-server
+
+
+Stopping a Daemon
+-----------------
+
+To stop a specific daemon instance on a Ceph Node, execute one of the
+following::
+
+       sudo systemctl stop ceph-osd@{id}
+       sudo systemctl stop ceph-mon@{hostname}
+       sudo systemctl stop ceph-mds@{hostname}
+
+For example::
+
+       sudo systemctl stop ceph-osd@1
+       sudo systemctl stop ceph-mon@ceph-server
+       sudo systemctl stop ceph-mds@ceph-server
+
+
+.. index:: Ceph service; Upstart; operating a cluster
+
+
 
 Running Ceph with Upstart
 =========================
 
-When deploying Ceph Cuttlefish and beyond with ``ceph-deploy`` on Ubuntu, 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.
+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:: 
 
@@ -153,207 +246,6 @@ include:
 
 
 
-Running Ceph with sysvinit
---------------------------
-
-Using traditional ``sysvinit`` is the recommended way to run  Ceph with CentOS,
-Red Hat, Fedora, Debian and SLES distributions. You may also use it for older
-distributions of Ubuntu.
-
-
-Starting all Daemons
-~~~~~~~~~~~~~~~~~~~~
-
-To start your Ceph cluster, execute ``ceph`` with the ``start`` command. 
-Use the following syntax:: 
-
-       sudo /etc/init.d/ceph [options] [start|restart] [daemonType|daemonID]
-       
-The following examples illustrates a typical use case::
-
-       sudo /etc/init.d/ceph -a start
-
-Once you execute with ``-a`` (i.e., execute on all nodes), Ceph should begin
-operating.
-
-
-Stopping all Daemons   
-~~~~~~~~~~~~~~~~~~~~
-
-To stop your Ceph cluster, execute ``ceph`` with the ``stop`` command. 
-Use the following syntax:: 
-
-       sudo /etc/init.d/ceph [options] stop [daemonType|daemonID]
-       
-The following examples illustrates a typical use case::
-
-       sudo /etc/init.d/ceph -a stop
-
-Once you execute with ``-a`` (i.e., execute on all nodes), Ceph should stop
-operating.
-
-
-Starting all Daemons by Type
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To start all Ceph daemons of a particular type on the local Ceph Node, use the
-following syntax::
-
-       sudo /etc/init.d/ceph start {daemon-type}
-       sudo /etc/init.d/ceph start osd
-
-To start all Ceph daemons of a particular type on another node, use the
-following syntax:: 
-
-       sudo /etc/init.d/ceph -a start {daemon-type}
-       sudo /etc/init.d/ceph -a start osd
-
-
-Stopping all Daemons by Type
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To stop all Ceph daemons of a particular type on the local Ceph Node, use the
-following syntax::
-
-       sudo /etc/init.d/ceph stop {daemon-type}
-       sudo /etc/init.d/ceph stop osd
-
-To stop all Ceph daemons of a particular type on another node, use the
-following syntax:: 
-
-       sudo /etc/init.d/ceph -a stop {daemon-type}
-       sudo /etc/init.d/ceph -a stop osd
-
-
-Starting a Daemon
-~~~~~~~~~~~~~~~~~
-
-To start a Ceph daemon on the local Ceph Node, use the following syntax::
-
-       sudo /etc/init.d/ceph start {daemon-type}.{instance}
-       sudo /etc/init.d/ceph start osd.0
-
-To start a Ceph daemon on another node, use the following syntax:: 
-
-       sudo /etc/init.d/ceph -a start {daemon-type}.{instance}
-       sudo /etc/init.d/ceph -a start osd.0
-
-
-Stopping a Daemon
-~~~~~~~~~~~~~~~~~
-
-To stop a Ceph daemon on the local Ceph Node, use the following syntax::
-
-       sudo /etc/init.d/ceph stop {daemon-type}.{instance}
-       sudo /etc/init.d/ceph stop osd.0
-
-To stop a Ceph daemon on another node, use the following syntax:: 
-
-       sudo /etc/init.d/ceph -a stop {daemon-type}.{instance}
-       sudo /etc/init.d/ceph -a stop osd.0
-
-
-Running Ceph as a Service
--------------------------
-
-When you deploy Ceph Argonaut or Bobtail with ``ceph-deploy``, you may operate
-Ceph as a service (you may also use sysvinit).
-
-
-Starting all Daemons
-~~~~~~~~~~~~~~~~~~~~
-
-To start your Ceph cluster, execute ``ceph`` with the ``start`` command. 
-Use the following syntax:: 
-
-       sudo service ceph [options] [start|restart] [daemonType|daemonID]
-       
-The following examples illustrates a typical use case::
-
-       sudo service ceph -a start      
-
-Once you execute with ``-a`` (i.e., execute on all nodes), Ceph should begin
-operating. 
-
-
-Stopping all Daemons   
-~~~~~~~~~~~~~~~~~~~~
-
-To stop your Ceph cluster, execute ``ceph`` with the ``stop`` command. 
-Use the following syntax:: 
-
-       sudo service ceph [options] stop [daemonType|daemonID]
-
-For example:: 
-
-       sudo service ceph -a stop
-       
-Once you execute with ``-a`` (i.e., execute on all nodes), Ceph should shut
-down.
-
-
-Starting all Daemons by Type
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To start all Ceph daemons of a particular type on the local Ceph Node, use the
-following syntax::
-
-       sudo service ceph start {daemon-type}
-       sudo service ceph start osd
-
-To start all Ceph daemons of a particular type on all nodes, use the following
-syntax:: 
-
-       sudo service ceph -a start {daemon-type}
-       sudo service ceph -a start osd
-
-
-Stopping all Daemons by Type
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-To stop all Ceph daemons of a particular type on the local Ceph Node, use the
-following syntax::
-
-       sudo service ceph stop {daemon-type}
-       sudo service ceph stop osd
-
-To stop all Ceph daemons of a particular type on all nodes, use the following
-syntax:: 
-
-       sudo service ceph -a stop {daemon-type}
-       sudo service ceph -a stop osd
-
-
-Starting a Daemon
-~~~~~~~~~~~~~~~~~
-
-To start a Ceph daemon on the local Ceph Node,  use the following syntax::
-
-       sudo service ceph start {daemon-type}.{instance}
-       sudo service ceph start osd.0
-
-To start a Ceph daemon on another node, use the following syntax:: 
-
-       sudo service ceph -a start {daemon-type}.{instance}
-       sudo service ceph -a start osd.0
-
-
-Stopping a Daemon
-~~~~~~~~~~~~~~~~~
-
-To stop a Ceph daemon on the local Ceph Node, use the following syntax::
-
-       sudo service ceph stop {daemon-type}.{instance}
-       sudo service ceph stop osd.0
-
-To stop a Ceph daemon on another node, use the following syntax:: 
-
-       sudo service ceph -a stop {daemon-type}.{instance}
-       sudo service ceph -a stop osd.0
-
-
-
-
 .. _Valgrind: http://www.valgrind.org/
 .. _Upstart: http://upstart.ubuntu.com/index.html
 .. _initctl: http://manpages.ubuntu.com/manpages/raring/en/man8/initctl.8.html