Merge "Bump NFS Ganesha version"
This commit is contained in:
commit
d2efe37715
@ -30,7 +30,7 @@ CEPH_RELEASE=${CEPH_RELEASE:-nautilus}
|
|||||||
|
|
||||||
CEPH_RELEASE_STABLE=${CEPH_RELEASE_STABLE:-luminous}
|
CEPH_RELEASE_STABLE=${CEPH_RELEASE_STABLE:-luminous}
|
||||||
|
|
||||||
GANESHA_RELEASE=${GANESHA_RELEASE:-deb-V2.7-stable}
|
GANESHA_RELEASE=${GANESHA_RELEASE:-V3.3-stable}
|
||||||
|
|
||||||
# Deploy a Ceph demo container instead of a non-containerized version
|
# Deploy a Ceph demo container instead of a non-containerized version
|
||||||
CEPH_CONTAINERIZED=$(trueorfalse False CEPH_CONTAINERIZED)
|
CEPH_CONTAINERIZED=$(trueorfalse False CEPH_CONTAINERIZED)
|
||||||
@ -802,7 +802,7 @@ EOF
|
|||||||
function cleanup_nfs_ganesha {
|
function cleanup_nfs_ganesha {
|
||||||
sudo systemctl stop nfs-ganesha
|
sudo systemctl stop nfs-ganesha
|
||||||
sudo systemctl disable nfs-ganesha
|
sudo systemctl disable nfs-ganesha
|
||||||
sudo uninstall_package nfs-ganesha nfs-ganesha-ceph libntirpc1
|
sudo uninstall_package nfs-ganesha nfs-ganesha-ceph libntirpc3 nfs-ganesha-rados-urls nfs-ganesha-vfs
|
||||||
}
|
}
|
||||||
|
|
||||||
function configure_ceph_embedded_manila {
|
function configure_ceph_embedded_manila {
|
||||||
@ -1001,14 +1001,14 @@ function configure_repo_nfsganesha {
|
|||||||
local ceph_release="$3"
|
local ceph_release="$3"
|
||||||
|
|
||||||
if is_ubuntu; then
|
if is_ubuntu; then
|
||||||
# FIXME(vkmc) We need to use community ppa's because there is no build
|
# FIXME(vkmc) We need to use community ppa's because there are no builds
|
||||||
# available for ubuntu xenial and above for nfs-ganesha-2.7.
|
# 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
|
# Remove this when they provide the build in download.ceph.com
|
||||||
sudo add-apt-repository -y ppa:nfs-ganesha/libntirpc-1.7
|
sudo add-apt-repository -y ppa:nfs-ganesha/libntirpc-3.0
|
||||||
sudo add-apt-repository -y ppa:nfs-ganesha/nfs-ganesha-2.7
|
sudo add-apt-repository -y ppa:nfs-ganesha/nfs-ganesha-3.0
|
||||||
sudo ${package_manager} -y update
|
sudo ${package_manager} -y update
|
||||||
elif is_fedora; then
|
elif is_fedora; then
|
||||||
dnf_add_repository_nfsganesha ${ganesha_release} ${ceph_release}
|
dnf_add_repository_nfsganesha rpm-${ganesha_release} ${ceph_release}
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1016,11 +1016,11 @@ function configure_repo_nfsganesha {
|
|||||||
# Usage: cleanup_repo_nfsganesha
|
# Usage: cleanup_repo_nfsganesha
|
||||||
function cleanup_repo_nfsganesha {
|
function cleanup_repo_nfsganesha {
|
||||||
if is_ubuntu; then
|
if is_ubuntu; then
|
||||||
# FIXME(vkmc) We need to use community ppa's because there is no build available
|
# FIXME(vkmc) We need to use community ppa's because there are no builds
|
||||||
# for ubuntu xenial and above for nfs-ganesha-2.7.
|
# 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
|
# Remove this when they provide the builds in download.ceph.com
|
||||||
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-libntirpc-3_0-*.list
|
||||||
sudo rm -rf /etc/apt/sources.list.d/nfs-ganesha-ubuntu-nfs-ganesha-2_7-*.list
|
sudo rm -rf /etc/apt/sources.list.d/nfs-ganesha-ubuntu-nfs-ganesha-3_0-*.list
|
||||||
elif is_fedora; then
|
elif is_fedora; then
|
||||||
sudo rm -rf /etc/yum.repos.d/nfs-ganesha.repo
|
sudo rm -rf /etc/yum.repos.d/nfs-ganesha.repo
|
||||||
fi
|
fi
|
||||||
@ -1035,7 +1035,8 @@ function setup_packages_for_manila_on_ubuntu {
|
|||||||
else
|
else
|
||||||
configure_repo_nfsganesha "apt-get" "$GANESHA_RELEASE" "$CEPH_RELEASE"
|
configure_repo_nfsganesha "apt-get" "$GANESHA_RELEASE" "$CEPH_RELEASE"
|
||||||
fi
|
fi
|
||||||
CEPH_PACKAGES="${CEPH_PACKAGES} libntirpc1 nfs-ganesha nfs-ganesha-ceph"
|
CEPH_PACKAGES="${CEPH_PACKAGES} libntirpc3 nfs-ganesha nfs-ganesha-ceph \
|
||||||
|
nfs-ganesha-rados-urls nfs-ganesha-vfs"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if python3_enabled; then
|
if python3_enabled; then
|
||||||
@ -1047,7 +1048,8 @@ function setup_packages_for_manila_on_fedora_family {
|
|||||||
if [ $MANILA_CEPH_DRIVER == 'cephfsnfs' ]; then
|
if [ $MANILA_CEPH_DRIVER == 'cephfsnfs' ]; then
|
||||||
# NOTE(vkmc) el7 packages work on Fedora
|
# NOTE(vkmc) el7 packages work on Fedora
|
||||||
configure_repo_nfsganesha "dnf" "$GANESHA_RELEASE" "$CEPH_RELEASE"
|
configure_repo_nfsganesha "dnf" "$GANESHA_RELEASE" "$CEPH_RELEASE"
|
||||||
CEPH_PACKAGES="${CEPH_PACKAGES} nfs-ganesha nfs-ganesha-ceph"
|
CEPH_PACKAGES="${CEPH_PACKAGES} nfs-ganesha nfs-ganesha-ceph \
|
||||||
|
nfs-ganesha-rados-urls nfs-ganesha-vfs"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user