cephadm,ceph-volume: update to umbrella

Signed-off-by: Alex Ainscow <aainscow@uk.ibm.com>

diff --git a/doc/dev/release-checklists.rst b/doc/dev/release-checklists.rst
index 9549dbddb56daf46ccb6fe6dc15e8c5b355ca416..83fa71998d549ccf048f4f13ab80e506b74acd1c 100644 (file)
--- a/doc/dev/release-checklists.rst
+++ b/doc/dev/release-checklists.rst
@@ -51,8 +51,8 @@ Scripts
 
 Misc
 ~~~~
-- [ ] update src/ceph-volume/ceph_volume/__init__.py (`__release__`)
-- [ ] update src/cephadm/cephadmlib/constants.py (`DEFAULT_IMAGE_RELEASE` and `LATEST_STABLE_RELEASE` to X)
+- [x] update src/ceph-volume/ceph_volume/__init__.py (`__release__`)
+- [x] update src/cephadm/cephadmlib/constants.py (`DEFAULT_IMAGE_RELEASE` and `LATEST_STABLE_RELEASE` to X)
 
 Feature bits
 ------------

diff --git a/src/ceph-volume/ceph_volume/__init__.py b/src/ceph-volume/ceph_volume/__init__.py
index 59feb5c09152dbd57f6227396ec85cd468933f5d..06a969d022e31913b9d11898386091ec05e8c103 100644 (file)
--- a/src/ceph-volume/ceph_volume/__init__.py
+++ b/src/ceph-volume/ceph_volume/__init__.py
@@ -61,4 +61,4 @@ conf = Config()
 
 __version__ = "1.0.0"
 
-__release__ = "tentacle"
+__release__ = "umbrella"

diff --git a/src/cephadm/cephadmlib/constants.py b/src/cephadm/cephadmlib/constants.py
index ba8f56785821e3943e26fd525f1bd808377fb32b..51582c2fa1e6e8478e9caa8026a6aea027cd546f 100644 (file)
--- a/src/cephadm/cephadmlib/constants.py
+++ b/src/cephadm/cephadmlib/constants.py
@@ -3,11 +3,11 @@
 # Default container images -----------------------------------------------------
 DEFAULT_IMAGE = 'quay.ceph.io/ceph-ci/ceph:main'
 DEFAULT_IMAGE_IS_MAIN = True
-DEFAULT_IMAGE_RELEASE = 'tentacle'
+DEFAULT_IMAGE_RELEASE = 'umbrella'
 DEFAULT_REGISTRY = 'quay.io'  # normalize unqualified digests to this
 # ------------------------------------------------------------------------------
 
-LATEST_STABLE_RELEASE = 'tentacle'
+LATEST_STABLE_RELEASE = 'umbrella'
 DATA_DIR = '/var/lib/ceph'
 LOG_DIR = '/var/log/ceph'
 LOCK_DIR = '/run/cephadm'