From 5ed71d25d581d9f7f73e1f6d7aea646ad6d49f2b Mon Sep 17 00:00:00 2001
From: Sage Weil <sage@redhat.com>
Date: Sat, 16 Mar 2019 15:01:40 -0500
Subject: [PATCH] ceph_release: the next release will be octopus

Signed-off-by: Sage Weil <sage@redhat.com>
---
 CMakeLists.txt             |  2 +-
 src/ceph_release           |  6 +++---
 src/common/ceph_strings.cc |  5 +++++
 src/include/rados.h        |  3 ++-
 src/mon/MgrMonitor.cc      | 11 +++++++++++
 5 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbabecbe971..6c95ede9ca3 100644
--- 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 3e182cb76a3..ba57d47558f 100644
--- 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 c7d1b7877d4..201f4dbb8ec 100644
--- 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 53320d65410..e8b05f2d765 100644
--- 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 e7608a1174b..453ac87aaaf 100644
--- 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",
+    }
   }
 };
 
-- 
2.39.5