From 742bba99bbe235ea51f16a3fffd5a3e38d0c17a3 Mon Sep 17 00:00:00 2001 From: Ernesto Puerta Date: Wed, 20 Mar 2024 10:42:23 +0100 Subject: [PATCH] ceph: improve building of dev images - Set `NVMEOF_GW` for `vstart` to work with nvmeof. - Help debug ceph.repo issues. - Add new `CEPH_CLUSTER_CEPH_REPO_BASEURL` alternative to setting `CEPH_BRANCH` and `CEPH_SHA`. - Fix setting `CEPH_CLUSTER_CEPH_REPO_BASEURL` in `Makefile` not to override value if externally set (via .env). Signed-off-by: Ernesto Puerta --- .env | 4 +++- Dockerfile.ceph | 20 ++++++++++++++------ Dockerfile.spdk | 3 ++- Makefile | 2 +- docker-compose.yaml | 7 ++++--- 5 files changed, 24 insertions(+), 12 deletions(-) diff --git a/.env b/.env index d2107f40..b91ca450 100644 --- a/.env +++ b/.env @@ -58,10 +58,12 @@ SPDK_CENTOS_REPO_VER="9.0-21.el9" # Ceph Cluster CEPH_CLUSTER_VERSION="${CEPH_VERSION}" +#CEPH_CLUSTER_VSTART_VERSION="v${CEPH_VERSION}" +CEPH_CLUSTER_VSTART_VERSION="main" CEPH_BRANCH=ceph-nvmeof-mon CEPH_SHA=a4f2962ef7ad30b6e015c14e2c398015a766695a -CEPH_VSTART_ARGS="--memstore" CEPH_DEVEL_MGR_PATH=../ceph +#CEPH_CLUSTER_CEPH_REPO_BASEURL=https://1.chacra.ceph.com/r/ceph/main/71e6beb6de9ad34b7d44be0ccdf38721ae92202d/centos/9/flavors/default # Demo settings RBD_POOL=rbd diff --git a/Dockerfile.ceph b/Dockerfile.ceph index 3b0f62bb..4b521eb0 100644 --- a/Dockerfile.ceph +++ b/Dockerfile.ceph @@ -4,7 +4,10 @@ FROM quay.io/centos/centos:stream9-minimal AS build ARG CEPH_CLUSTER_VERSION +ARG CEPH_CLUSTER_VSTART_VERSION ARG CEPH_CLUSTER_CEPH_REPO_BASEURL +ARG CEPH_BRANCH +ARG CEPH_SHA ARG CEPH_CLUSTER_EPEL_REPO_URL="https://copr.fedorainfracloud.org/coprs/ceph/el9/repo/epel-9/ceph-el9-epel-9.repo" ARG MICRODNF_OPTS="\ @@ -48,6 +51,9 @@ RUN <- sh -c './vstart.sh --new $$CEPH_VSTART_ARGS && - ceph osd pool create rbd && - echo ceph dashboard nvmeof-gateway-add -i <(echo nvmeof-devel:5500) nvmeof.1 && sleep infinity' healthcheck: test: ceph osd pool stats rbd