doc/releases: mark octopus eol

Signed-off-by: Josh Durgin <jdurgin@redhat.com>

diff --git a/doc/_ext/ceph_releases.py b/doc/_ext/ceph_releases.py
index 481c2a1b6194414538def5552ca18c1ea27dfb3b..94e92ffdd6acdc99d636c7fbda06634de8529e7e 100644 (file)
--- a/doc/_ext/ceph_releases.py
+++ b/doc/_ext/ceph_releases.py
@@ -191,7 +191,7 @@ class ReleasesGantt(Directive):
 
 class CephTimeline(Directive):
     has_content = False
-    required_arguments = 4
+    required_arguments = 3
     optional_arguments = 0
     option_spec = {}
 

diff --git a/doc/releases/index.rst b/doc/releases/index.rst
index 9aca33d6d1c78048d6d931b40a1bcd1d3ca57a2b..94205376320567be8910c143003c06ce282b4c61 100644 (file)
--- a/doc/releases/index.rst
+++ b/doc/releases/index.rst
@@ -23,7 +23,6 @@ security fixes.
 
    Quincy (v17.2.*) <quincy>
    Pacific (v16.2.*) <pacific>
-   Octopus (v15.2.*) <octopus>
 
 .. ceph_releases:: releases.yml current
 
@@ -40,6 +39,7 @@ receive bug fixes or backports).
    :maxdepth: 1
    :hidden:
 
+   Octopus (v15.2.*) <octopus>
    Nautilus (v14.2.*) <nautilus>
    Mimic (v13.2.*) <mimic>
    Luminous (v12.2.*) <luminous>
@@ -58,8 +58,8 @@ receive bug fixes or backports).
 Release timeline
 ----------------
 
-.. ceph_timeline_gantt:: releases.yml quincy pacific octopus
-.. ceph_timeline:: releases.yml quincy pacific octopus
+.. ceph_timeline_gantt:: releases.yml quincy pacific
+.. ceph_timeline:: releases.yml quincy pacific
 
 .. _Quincy: quincy
 .. _17.2.0: quincy#v17-2-0-quincy

diff --git a/doc/releases/releases.yml b/doc/releases/releases.yml
index 1268a76cee8c72af4857988fc353a4338f6f7aa9..e4ad504336e0f1e7dbfa83aad833e8ab2f667201 100644 (file)
--- a/doc/releases/releases.yml
+++ b/doc/releases/releases.yml
@@ -56,6 +56,7 @@ releases:
 
   octopus:
     target_eol: 2022-06-01
+    actual_eol: 2022-08-09
     releases:
       - version: 15.2.17
         released: 2022-08-09