stable-2.2: Fix nfs-ganesha package installation

The gluster/nfs-ganesha PPA does not contain any nfs-ganesha builds
with the Ceph FSAL enabled, so adding that PPA is fairly useless.

Set the correct PPA (gluster/nfs-ganesha-2.5), and also correct the
PPA name for libntirpc.

Finally, install the correct package (nfs-ganesha-ceph not
nfs-ganesha-fsal).

Fixes #1905.

diff --git a/roles/ceph-common/tasks/installs/debian_ceph_repository.yml b/roles/ceph-common/tasks/installs/debian_ceph_repository.yml
index 45991f153cb9a1616aeabc6be90ffe53d19274a1..e7b798cacf77fb850e130dfe844b0b48835105a7 100644 (file)
--- a/roles/ceph-common/tasks/installs/debian_ceph_repository.yml
+++ b/roles/ceph-common/tasks/installs/debian_ceph_repository.yml
@@ -56,8 +56,8 @@
     repo: "{{ item }}"
     state: present
   with_items:
-    - ppa:gluster/libntirpc
-    - ppa:gluster/nfs-ganesha
+    - ppa:gluster/libntirpc-1.5
+    - ppa:gluster/nfs-ganesha-2.5
   changed_when: false
   when:
     - (nfs_obj_gw or nfs_file_gw)

diff --git a/roles/ceph-common/tasks/installs/install_on_debian.yml b/roles/ceph-common/tasks/installs/install_on_debian.yml
index f2577639928fa46f8332094fdd801730e8c58b61..033653f6d20e7f9f50758577248e7794068a0633 100644 (file)
--- a/roles/ceph-common/tasks/installs/install_on_debian.yml
+++ b/roles/ceph-common/tasks/installs/install_on_debian.yml
@@ -53,7 +53,7 @@
 
 - name: install NFS gateway
   apt:
-    pkg: nfs-ganesha-fsal
+    pkg: nfs-ganesha-ceph
     state: "{{ (upgrade_ceph_packages|bool) | ternary('latest','present') }}"
     update_cache: yes
   when: nfs_group_name in group_names