centos/ubuntu: Bump ganesha to 2.6

Ganesha 2.6 have been released and is needed to get a proper mimic support. Signed-off-by: Erwan Velu <[email protected]> (cherry picked from commit 722e147) Signed-off-by: Sébastien Han <[email protected]>
ceph · Jul 24, 2018 · 4184491 · 4184491
1 parent edb24ec
commit 4184491
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__ b/ceph-releases/ALL/centos/daemon-base/__DOCKERFILE_INSTALL__
@@ -2,7 +2,7 @@ bash -c ' \
   if [ -n "__GANESHA_PACKAGES__" ]; then \
     echo "[ganesha]" > /etc/yum.repos.d/ganesha.repo ; \
     echo "name=ganesha" >> /etc/yum.repos.d/ganesha.repo ; \
-    echo "baseurl=http://download.ceph.com/nfs-ganesha/rpm-V2.5-stable/$CEPH_VERSION/\$basearch/" >> /etc/yum.repos.d/ganesha.repo ; \
+    echo "baseurl=http://download.ceph.com/nfs-ganesha/rpm-V2.6-stable/$CEPH_VERSION/\$basearch/" >> /etc/yum.repos.d/ganesha.repo ; \
     echo "gpgcheck=0" >> /etc/yum.repos.d/ganesha.repo ; \
     echo "enabled=1" >> /etc/yum.repos.d/ganesha.repo  ; \
   fi && \
@@ -15,4 +15,4 @@ yum update -y && \
 rpm --import 'https://download.ceph.com/keys/release.asc' && \
 rpm -Uvh http://download.ceph.com/rpm-${CEPH_VERSION}/el7/noarch/ceph-release-1-1.el7.noarch.rpm && \
 yum install -y epel-release && \
-yum install -y __CEPH_BASE_PACKAGES__
+yum install -y __CEPH_BASE_PACKAGES__
diff --git a/ceph-releases/ALL/ubuntu/daemon-base/__DOCKERFILE_INSTALL__ b/ceph-releases/ALL/ubuntu/daemon-base/__DOCKERFILE_INSTALL__
@@ -2,7 +2,7 @@
     # TODO: Not sure if deb-V2.5-stable is the right repo for ganesha in mimic. Revisit for mimic.
     bash -c ' \
       if [ -n "__GANESHA_PACKAGES__" ]; then \
-        echo "deb http://download.ceph.com/nfs-ganesha/deb-V2.5-stable/$CEPH_VERSION/ __OS_CODENAME__ main" \
+        echo "deb http://download.ceph.com/nfs-ganesha/deb-V2.6-stable/$CEPH_VERSION/ __OS_CODENAME__ main" \
           | tee /etc/apt/sources.list.d/nfs-ganesha.list ; \
       fi' && \
     apt-key add /tmp/ceph-release.asc && \
@@ -11,4 +11,4 @@
     DEBIAN_FRONTEND=noninteractive apt-get update && \
     # TODO: What are 'ca-certificates', 'kmod' needed for?
     DEBIAN_FRONTEND=noninteractive apt-get install -yy --force-yes --no-install-recommends \
-        __CEPH_BASE_PACKAGES__
+        __CEPH_BASE_PACKAGES__