diff --git a/.gitreview b/.gitreview index 64aebd2..8fc853f 100644 --- a/.gitreview +++ b/.gitreview @@ -2,3 +2,4 @@ host=review.opendev.org port=29418 project=openstack/devstack-plugin-ceph.git +defaultbranch=stable/2025.1 diff --git a/devstack/lib/cephadm b/devstack/lib/cephadm index 43127d5..8428d0e 100755 --- a/devstack/lib/cephadm +++ b/devstack/lib/cephadm @@ -18,7 +18,7 @@ XTRACE=$(set +o | grep xtrace) set +o xtrace # GENERIC CEPHADM INTERNAL OPTIONS, DO NOT EDIT -CEPH_RELEASE=${CEPH_RELEASE:-reef} +CEPH_RELEASE=${CEPH_RELEASE:-squid} CEPH_PUB_KEY="/etc/ceph/ceph.pub" CEPH_CONFIG="/etc/ceph/ceph.conf" BOOTSTRAP_CONFIG="$HOME/bootstrap_ceph.conf" @@ -29,7 +29,7 @@ DISABLE_CEPHADM_POST_DEPLOY=${DISABLE_CEPHADM_POST_DEPLOY:-False} # DEFAULT OPTIONS ATTEMPTS=30 -CONTAINER_IMAGE=${CONTAINER_IMAGE:-'quay.io/ceph/ceph:v18.2'} +CONTAINER_IMAGE=${CONTAINER_IMAGE:-'quay.io/ceph/ceph:v19'} DEVICES=() if [[ "$REMOTE_CEPH" = "False" ]]; then FSID=$(uuidgen) diff --git a/tox.ini b/tox.ini index fe80eb7..ff1b728 100644 --- a/tox.ini +++ b/tox.ini @@ -26,7 +26,7 @@ commands = bash -c "find {toxinidir} \ [testenv:docs] deps = - -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/master} + -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2025.1} -r{toxinidir}/doc/requirements.txt commands = rm -rf doc/build