From e3ef005d2ed685a522c2e03e57bf51c6636d17f9 Mon Sep 17 00:00:00 2001
From: Alexander Indenbaum <aindenba@redhat.com>
Date: Tue, 16 Jul 2024 13:16:48 +0000
Subject: [PATCH] Bump ceph

Enable mon_nvmeofgw_in_service in the ceph/vstart.sh

Signed-off-by: Alexander Indenbaum <aindenba@redhat.com>
---
 .env            | 5 ++---
 Dockerfile.ceph | 2 +-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.env b/.env
index 93ad551c..50722b95 100644
--- a/.env
+++ b/.env
@@ -58,10 +58,9 @@ SPDK_CENTOS_REPO_VER="9.0-21.el9"
 
 # Ceph Cluster
 CEPH_CLUSTER_VERSION="${CEPH_VERSION}"
-CEPH_BRANCH=ceph-nvmeof-mon
-CEPH_SHA=9ea3798e13aefca4c462ddc4d11b525236aebadb
+CEPH_BRANCH=wip-baum-20240725-01-centos9-only
+CEPH_SHA=007dfb45a6942a1c2ff04b4d18f3d3810eda3afe
 
-CEPH_VSTART_ARGS="--memstore"
 CEPH_DEVEL_MGR_PATH=../ceph
 
 # Demo settings
diff --git a/Dockerfile.ceph b/Dockerfile.ceph
index 3b0f62bb..faa090c0 100644
--- a/Dockerfile.ceph
+++ b/Dockerfile.ceph
@@ -98,7 +98,7 @@ ENV MON=1 \
     RGW=0 \
     NFS=0 \
     CEPH_PORT=10000 \
-    CEPH_VSTART_ARGS="--memstore"
+    CEPH_VSTART_ARGS="--memstore -o mon_nvmeofgw_in_service=true"
 
 ENV CEPH_BIN=/usr/bin \
     CEPH_LIB=/usr/lib64/ceph \