From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Wed, 3 Mar 2021 13:00:51 +0000 (+0100)
Subject: doc/cephadm: Add Compatibility with Podman Versions
X-Git-Tag: v16.2.2~1^2~39
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=16ba333c847c2f1713bf18e0dc19801973bdae77;p=ceph.git

doc/cephadm: Add Compatibility with Podman Versions

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit f15f0deccb93d0ec79beb4f7ba32c843e6e07e63)
---

diff --git a/doc/cephadm/compatibility.rst b/doc/cephadm/compatibility.rst
new file mode 100644
index 0000000000000..dbfa13ca5b8aa
--- /dev/null
+++ b/doc/cephadm/compatibility.rst
@@ -0,0 +1,68 @@
+
+===========================
+Compatibility and Stability
+===========================
+
+Compatibility with Podman Versions
+----------------------------------
+
+Podman and Ceph have different end-of-life strategies that
+might make it challenging to find compatible Podman and Ceph 
+versions
+
+Those versions are expected to work:
+
+
++-----------+---------------------------------------+
+|  Ceph     |                 Podman                |
++-----------+-------+-------+-------+-------+-------+
+|           | 1.9   |  2.0  |  2.1  |  2.2  |  3.0  |
++===========+=======+=======+=======+=======+=======+
+| <= 15.2.5 | True  | False | False | False | False |
++-----------+-------+-------+-------+-------+-------+
+| >= 15.2.6 | True  | True  | True  | False | False |
++-----------+-------+-------+-------+-------+-------+
+| >= 16.2.1 | False | True  | True  | False | True  |
++-----------+-------+-------+-------+-------+-------+
+
+.. _cephadm-stability:
+
+Stability
+---------
+
+Cephadm is a new feature in the Octopus release and has seen limited
+use in production and at scale.  We would like users to try cephadm,
+especially for new clusters, but please be aware that some
+functionality is still rough around the edges.  We expect fairly
+frequent updates and improvements over the first several bug fix
+releases of Octopus.
+
+Cephadm management of the following components are currently well-supported:
+
+- Monitors
+- Managers
+- OSDs
+- CephFS file systems
+- rbd-mirror
+- NFS
+- iSCSI
+
+The following components are working with cephadm, but the
+documentation is not as complete as we would like, and there may be some
+changes in the near future:
+
+- RGW
+
+Cephadm support for the following features is still under development:
+
+- RGW-HA
+
+If you run into problems, you can always pause cephadm with::
+
+  ceph orch pause
+
+Or turn cephadm off completely with::
+
+  ceph orch set backend ''
+  ceph mgr module disable cephadm
+
diff --git a/doc/cephadm/index.rst b/doc/cephadm/index.rst
index c5b32d83fa403..d9531d51ca58c 100644
--- a/doc/cephadm/index.rst
+++ b/doc/cephadm/index.rst
@@ -28,7 +28,7 @@ versions of Ceph.
 .. toctree::
     :maxdepth: 1
 
-    stability
+    compatibility
     install
     adoption
     host-management
diff --git a/doc/cephadm/stability.rst b/doc/cephadm/stability.rst
deleted file mode 100644
index c7aff29c459c9..0000000000000
--- a/doc/cephadm/stability.rst
+++ /dev/null
@@ -1,41 +0,0 @@
-.. _cephadm-stability:
-
-Stability
-=========
-
-Cephadm is a new feature in the Octopus release and has seen limited
-use in production and at scale.  We would like users to try cephadm,
-especially for new clusters, but please be aware that some
-functionality is still rough around the edges.  We expect fairly
-frequent updates and improvements over the first several bug fix
-releases of Octopus.
-
-Cephadm management of the following components are currently well-supported:
-
-- Monitors
-- Managers
-- OSDs
-- CephFS file systems
-- rbd-mirror
-- NFS
-- iSCSI
-
-The following components are working with cephadm, but the
-documentation is not as complete as we would like, and there may be some
-changes in the near future:
-
-- RGW
-
-Cephadm support for the following features is still under development:
-
-- RGW-HA
-
-If you run into problems, you can always pause cephadm with::
-
-  ceph orch pause
-
-Or turn cephadm off completely with::
-
-  ceph orch set backend ''
-  ceph mgr module disable cephadm
-