Skip to content

Commit

Permalink
Bump Ceph to Squid
Browse files Browse the repository at this point in the history
Deploy Squid by default

Signed-off-by: Francesco Pantano <[email protected]>
  • Loading branch information
fmount committed Dec 2, 2024
1 parent 9892d01 commit 516ff62
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ MANILA_KUTTL_DIR ?= ${OPERATOR_BASE_DIR}/manila-operator/test/kuttl/tests
MANILA_KUTTL_NAMESPACE ?= manila-kuttl-tests

# Ceph
CEPH_IMG ?= quay.io/ceph/demo:latest-reef
CEPH_IMG ?= quay.io/ceph/demo:latest-squid
CEPH_REPO ?= https://github.com/rook/rook.git
CEPH_BRANCH ?= release-1.15
CEPH_CRDS ?= ${OPERATOR_BASE_DIR}/rook/deploy/examples/crds.yaml
Expand Down
4 changes: 2 additions & 2 deletions devsetup/ceph/deploy.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ REQUIREMENTS=("jq" "lvm" "python3")

# DEFAULT OPTIONS
FSID="4b5c8c0a-ff60-454b-a1b4-9747aa737d19"
CONTAINER_IMAGE=${CONTAINER_IMAGE:-'quay.io/ceph/ceph:v18.1'}
CONTAINER_IMAGE=${CONTAINER_IMAGE:-'quay.io/ceph/ceph:v19'}
IP=${IP:-'127.0.0.1'}
DEVICES=()
SERVICES=()
Expand Down Expand Up @@ -108,7 +108,7 @@ function enroll_hosts {
}

function install_cephadm {
curl -o cephadm https://raw.githubusercontent.com/ceph/ceph/reef/src/cephadm/cephadm.py
curl -o cephadm https://raw.githubusercontent.com/ceph/ceph/squid/src/cephadm/cephadm.py
$SUDO mv cephadm $TARGET_BIN
$SUDO chmod +x $TARGET_BIN/cephadm
echo "[INSTALL CEPHADM] cephadm is ready"
Expand Down
2 changes: 1 addition & 1 deletion scripts/gen-ceph-kustomize.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ metadata:
spec:
hostNetwork: $CEPH_HOSTNETWORK
containers:
- image: quay.io/ceph/ceph:v18
- image: quay.io/ceph/ceph:v19
name: ceph
env:
- name: MON_IP
Expand Down

0 comments on commit 516ff62

Please sign in to comment.