ceph_release: the next release will be octopus

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbabecbe9710088c81ca0eea07df159dd50b1a72..6c95ede9ca3561335d50442fbb73fb036d68dd60 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.5.1)
 
 project(ceph CXX C ASM)
-set(VERSION 14.2.0)
+set(VERSION 15.0.0)
 
 if(POLICY CMP0028)
   cmake_policy(SET CMP0028 NEW)

diff --git a/src/ceph_release b/src/ceph_release
index 3e182cb76a30ca5731263c6b9dad1a91f79c30d9..ba57d47558fc90e5ceaf1a9f57bb58368b0bda5a 100644 (file)
--- a/src/ceph_release
+++ b/src/ceph_release
@@ -1,3 +1,3 @@
-14
-nautilus
-stable
+15
+octopus
+dev

diff --git a/src/common/ceph_strings.cc b/src/common/ceph_strings.cc
index c7d1b7877d4e007eeb3b14a7c40e4759893a1850..201f4dbb8ec6eaa0656b2309fa3bf8a64871fdd8 100644 (file)
--- a/src/common/ceph_strings.cc
+++ b/src/common/ceph_strings.cc
@@ -101,6 +101,8 @@ const char *ceph_release_name(int r)
                return "mimic";
        case CEPH_RELEASE_NAUTILUS:
                return "nautilus";
+       case CEPH_RELEASE_OCTOPUS:
+               return "octopus";
        default:
                if (r < 0)
                        return "unspecified";
@@ -113,6 +115,9 @@ int ceph_release_from_name(const char *s)
        if (!s) {
                return -1;
        }
+       if (strcmp(s, "octopus") == 0) {
+               return CEPH_RELEASE_OCTOPUS;
+       }
        if (strcmp(s, "nautilus") == 0) {
                return CEPH_RELEASE_NAUTILUS;
        }

diff --git a/src/include/rados.h b/src/include/rados.h
index 53320d65410c619ac75152159737e2803a40ed7e..e8b05f2d7651d7c3d026c23252a9de1d3def42d0 100644 (file)
--- a/src/include/rados.h
+++ b/src/include/rados.h
@@ -190,7 +190,8 @@ extern const char *ceph_osd_state_name(int s);
 #define CEPH_RELEASE_LUMINOUS   12
 #define CEPH_RELEASE_MIMIC      13
 #define CEPH_RELEASE_NAUTILUS   14
-#define CEPH_RELEASE_MAX        15  /* highest + 1 */
+#define CEPH_RELEASE_OCTOPUS    15
+#define CEPH_RELEASE_MAX        16  /* highest + 1 */
 
 extern const char *ceph_release_name(int r);
 extern int ceph_release_from_name(const char *s);

diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc
index e7608a1174b42b284bdbab3ee57a98cad771ecf0..453ac87aaafd03a300b3850c498661f8202d8ffe 100644 (file)
--- a/src/mon/MgrMonitor.cc
+++ b/src/mon/MgrMonitor.cc
@@ -50,6 +50,17 @@ const static std::map<uint32_t, std::set<std::string>> always_on_modules = {
       "orchestrator_cli",
       "volumes",
     }
+  },
+  {
+    CEPH_RELEASE_OCTOPUS, {
+      "crash",
+      "status",
+      "progress",
+      "balancer",
+      "devicehealth",
+      "orchestrator_cli",
+      "volumes",
+    }
   }
 };