From: Florian Haas <florian@hastexo.com>
Date: Fri, 15 Sep 2017 13:34:59 +0000 (+0200)
Subject: stable-2.2: Fix nfs-ganesha package installation
X-Git-Tag: v2.2.12~4^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f349b90bc8c8413751df32c2be1eeea3b7f38357;p=ceph-ansible.git

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 45991f153..e7b798cac 100644
--- 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 f25776399..033653f6d 100644
--- 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