openstack
/
devstack-plugin-ceph
Code Issues Proposed changes

Update ceph default version to octopus 

Consume packages from download.ceph.com for ceph octopus
Our focal fossa based CI jobs are getting octopus from
ubuntu ppas instead of getting the packages from
download.ceph.com.

This happens because, even though we were defaulting to
nautilus, ubuntu got the later version available
(in this case, the packages in ubuntu ppas).

Also, remove CEPH_STABLE_RELEASE env var, unify to CEPH_RELEASE
Stable branches CI versioning is done in the jobs definition now

Change-Id: I1edd5a50079f325fa143a7e0d51b3aa3bb5ed45d
This commit is contained in:
Victoria Martinez de la Cruz 2021-02-23 21:14:45 +00:00
parent 57b5ab1520
commit 4c23af18d0
2 changed files with 37 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.zuul.yaml
View File

@ -42,6 +42,9 @@
- stable/pike
- stable/queens
- stable/rocky
vars:
devstack_localrc:
CEPH_RELEASE: "luminous"
- job:
name: devstack-plugin-ceph-tempest
@ -58,6 +61,7 @@
vars:
devstack_localrc:
ENABLE_VOLUME_MULTIATTACH: true
CEPH_RELEASE: "nautilus"
- job:
name: devstack-plugin-ceph-tempest-py3-base
@ -98,6 +102,9 @@
- stable/pike
- stable/queens
- stable/rocky
vars:
devstack_localrc:
CEPH_RELEASE: "luminous"
- job:
name: devstack-plugin-ceph-tempest-py3
@ -112,6 +119,8 @@
vars:
devstack_localrc:
ENABLE_VOLUME_MULTIATTACH: true
CEPH_RELEASE: "nautilus"
GANESHA_RELEASE: "V2.8-stable"
- job:
name: devstack-plugin-ceph-compute-local-ephemeral

49
devstack/lib/ceph
View File

@ -26,9 +26,7 @@ set +o xtrace
# Defaults
# --------
CEPH_RELEASE=${CEPH_RELEASE:-nautilus}
CEPH_RELEASE_STABLE=${CEPH_RELEASE_STABLE:-luminous}
CEPH_RELEASE=${CEPH_RELEASE:-octopus}
GANESHA_RELEASE=${GANESHA_RELEASE:-V3.3-stable}
@ -979,9 +977,6 @@ function configure_repo_ceph {
# Usage: cleanup_repo_ceph
function cleanup_repo_ceph {
if is_ubuntu; then
if [[ $os_CODENAME =~ (xenial) ]]; then
sudo apt-add-repository -r -y "deb https://download.ceph.com/debian-${CEPH_RELEASE_STABLE}/ ${os_CODENAME} main"
fi
sudo apt-add-repository -r -y "deb https://download.ceph.com/debian-${CEPH_RELEASE}/ ${os_CODENAME} main"
elif is_fedora; then
sudo rm -rf /etc/yum.repos.d/ceph.repo
@ -992,7 +987,7 @@ function cleanup_repo_ceph {
# Usage: configure_repo_nfsganesha <package_manager> <ganesha_flavor> \
# <distro_type> <distro_release> [<repo_type>]
# - package_manager: apt-get or dnf
# - ganesha_release: 2.5, 2.5
# - ganesha_release: 2.7, 2.8, 3.0
# - ceph_release: ceph_luminous, ceph_nautilus
function configure_repo_nfsganesha {
local package_manager="$1"
@ -1003,8 +998,18 @@ function configure_repo_nfsganesha {
# FIXME(vkmc) We need to use community ppa's because there are no builds
# for ubuntu bionic and ubuntu focal available for nfs-ganesha 2.7 and above
# Remove this when they provide the build in download.ceph.com
sudo add-apt-repository -y ppa:nfs-ganesha/libntirpc-3.0
sudo add-apt-repository -y ppa:nfs-ganesha/nfs-ganesha-3.0
if [ $GANESHA_RELEASE == 'V3.3-stable' ]; then
sudo add-apt-repository -y ppa:nfs-ganesha/libntirpc-3.0
sudo add-apt-repository -y ppa:nfs-ganesha/nfs-ganesha-3.0
elif [ $GANESHA_RELEASE == 'V2.8-stable' ]; then
sudo add-apt-repository -y ppa:nfs-ganesha/libntirpc-1.8
sudo add-apt-repository -y ppa:nfs-ganesha/nfs-ganesha-2.8
elif [ $GANESHA_RELEASE == 'V2.7-stable' ]; then
sudo add-apt-repository -y ppa:nfs-ganesha/libntirpc-1.7
sudo add-apt-repository -y ppa:nfs-ganesha/nfs-ganesha-2.7
else
die $LINENO "GANESHA_RELEASE is not supported by the Ceph plugin for Devstack"
fi
sudo ${package_manager} -y update
elif is_fedora; then
dnf_add_repository_nfsganesha rpm-${ganesha_release} ${ceph_release}
@ -1018,8 +1023,18 @@ function cleanup_repo_nfsganesha {
# FIXME(vkmc) We need to use community ppa's because there are no builds
# for ubuntu bionic and ubuntu focal available for nfs-ganesha 2.7 and above
# Remove this when they provide the builds in download.ceph.com
sudo rm -rf /etc/apt/sources.list.d/nfs-ganesha-ubuntu-libntirpc-3_0-*.list*
sudo rm -rf /etc/apt/sources.list.d/nfs-ganesha-ubuntu-nfs-ganesha-3_0-*.list*
if [ $GANESHA_RELEASE == 'V3.3-stable' ]; then
sudo rm -rf /etc/apt/sources.list.d/nfs-ganesha-ubuntu-libntirpc-3_0-*.list*
sudo rm -rf /etc/apt/sources.list.d/nfs-ganesha-ubuntu-nfs-ganesha-3_0-*.list*
elif [ $GANESHA_RELEASE == 'V2.8-stable' ]; then
sudo rm -rf /etc/apt/sources.list.d/nfs-ganesha-ubuntu-libntirpc-1_8-*.list*
sudo rm -rf /etc/apt/sources.list.d/nfs-ganesha-ubuntu-nfs-ganesha-2_8-*.list*
elif [ $GANESHA_RELEASE == 'V2.7-stable' ]; then
sudo rm -rf /etc/apt/sources.list.d/nfs-ganesha-ubuntu-libntirpc-1_7-*.list*
sudo rm -rf /etc/apt/sources.list.d/nfs-ganesha-ubuntu-nfs-ganesha-2_7-*.list*
else
die $LINENO "GANESHA_RELEASE is not supported by the Ceph plugin for Devstack"
fi
elif is_fedora; then
sudo rm -rf /etc/yum.repos.d/nfs-ganesha.repo
fi
@ -1029,11 +1044,7 @@ function setup_packages_for_manila_on_ubuntu {
CEPH_PACKAGES="${CEPH_PACKAGES} ceph-mds libcephfs2"
if [ $MANILA_CEPH_DRIVER == 'cephfsnfs' ]; then
if [[ $os_CODENAME =~ (xenial) ]]; then
configure_repo_nfsganesha "apt-get" "$GANESHA_RELEASE" "$CEPH_RELEASE_STABLE"
else
configure_repo_nfsganesha "apt-get" "$GANESHA_RELEASE" "$CEPH_RELEASE"
fi
configure_repo_nfsganesha "apt-get" "$GANESHA_RELEASE" "$CEPH_RELEASE"
CEPH_PACKAGES="${CEPH_PACKAGES} libntirpc3 nfs-ganesha nfs-ganesha-ceph \
nfs-ganesha-rados-urls nfs-ganesha-vfs"
fi
@ -1062,11 +1073,7 @@ function install_ceph {
# NOTE(vkmc) Dependencies for setting up repos
install_package software-properties-common
if [[ $os_CODENAME =~ (xenial) ]]; then
configure_repo_ceph "apt-get" "$CEPH_RELEASE_STABLE" "$os_CODENAME"
else
configure_repo_ceph "apt-get" "$CEPH_RELEASE" "$os_CODENAME"
fi
configure_repo_ceph "apt-get" "$CEPH_RELEASE" "$os_CODENAME"
CEPH_PACKAGES="ceph libnss3-tools"
if python3_enabled; then