From 4d3e8cf65c40c95dad30e945da7bcc89a4d8f75f Mon Sep 17 00:00:00 2001
From: Victoria Martinez de la Cruz <victoria@redhat.com>
Date: Mon, 5 Oct 2020 13:25:12 -0300
Subject: [PATCH] Bump NFS Ganesha version

We are using NFS Ganesha 2.7 which is not longer supported
by the Ganesha community. Let's use v3.0 instead.

Closes-Bug: #1898952
Change-Id: I69543fd33c98817bba76c6712ae91264c532c12c
---
 devstack/lib/ceph | 30 ++++++++++++++++--------------
 1 file changed, 16 insertions(+), 14 deletions(-)

diff --git a/devstack/lib/ceph b/devstack/lib/ceph
index cfe9bd7..a5df6bd 100755
--- a/devstack/lib/ceph
+++ b/devstack/lib/ceph
@@ -30,7 +30,7 @@ CEPH_RELEASE=${CEPH_RELEASE:-nautilus}
 
 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
 CEPH_CONTAINERIZED=$(trueorfalse False CEPH_CONTAINERIZED)
@@ -787,7 +787,7 @@ EOF
 function cleanup_nfs_ganesha {
     sudo systemctl stop 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 {
@@ -986,14 +986,14 @@ function configure_repo_nfsganesha {
     local ceph_release="$3"
 
     if is_ubuntu; then
-        # FIXME(vkmc) We need to use community ppa's because there is no build
-        # available for ubuntu xenial and above for nfs-ganesha-2.7.
+        # 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-1.7
-        sudo add-apt-repository -y ppa:nfs-ganesha/nfs-ganesha-2.7
+        sudo add-apt-repository -y ppa:nfs-ganesha/libntirpc-3.0
+        sudo add-apt-repository -y ppa:nfs-ganesha/nfs-ganesha-3.0
         sudo ${package_manager} -y update
     elif is_fedora; then
-        dnf_add_repository_nfsganesha ${ganesha_release} ${ceph_release}
+        dnf_add_repository_nfsganesha rpm-${ganesha_release} ${ceph_release}
     fi
 }
 
@@ -1001,11 +1001,11 @@ function configure_repo_nfsganesha {
 # Usage: cleanup_repo_nfsganesha
 function cleanup_repo_nfsganesha {
     if is_ubuntu; then
-            # FIXME(vkmc) We need to use community ppa's because there is no build available
-            # for ubuntu xenial and above for nfs-ganesha-2.7.
-            # Remove this when they provide the build 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-nfs-ganesha-2_7-*.list
+        # 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
     elif is_fedora; then
         sudo rm -rf /etc/yum.repos.d/nfs-ganesha.repo
     fi
@@ -1020,7 +1020,8 @@ function setup_packages_for_manila_on_ubuntu {
         else
             configure_repo_nfsganesha "apt-get" "$GANESHA_RELEASE" "$CEPH_RELEASE"
         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
 
     if python3_enabled; then
@@ -1032,7 +1033,8 @@ function setup_packages_for_manila_on_fedora_family {
     if [ $MANILA_CEPH_DRIVER == 'cephfsnfs' ]; then
         # NOTE(vkmc) el7 packages work on Fedora
         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
 }