From 0654aaff47de9ee841a019f0498a0d5fdeda83d4 Mon Sep 17 00:00:00 2001
From: whhan91 <whhan91@gmail.com>
Date: Fri, 26 Jul 2019 08:44:48 +0000
Subject: [PATCH] Update glusterfs version 3.7 to 6

Update old gluster version to latest (3.7 to 6)

Change-Id: I70dec3fdfdecec6a4ce476676057eb5efdea39d4
---
 devstack/gluster-functions.sh | 10 +---------
 devstack/plugin.sh            |  4 ++--
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/devstack/gluster-functions.sh b/devstack/gluster-functions.sh
index 05a872d..f2c2023 100755
--- a/devstack/gluster-functions.sh
+++ b/devstack/gluster-functions.sh
@@ -3,20 +3,12 @@
 # devstack/gluster-functions.sh
 # Functions to control the installation and configuration of the **GlusterFS** storage
 
-# Installs 3.x version of glusterfs
 # Triggered from devstack/plugin.sh as part of devstack "pre-install"
 function install_glusterfs {
     if [[ ${DISTRO} =~ rhel7 ]] && [[ ! -f /etc/yum.repos.d/glusterfs-epel.repo ]]; then
         sudo wget $GLUSTERFS_CENTOS_REPO -O /etc/yum.repos.d/glusterfs-epel.repo
     elif is_ubuntu; then
-        sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 3FE869A9
-        if [ "$1" == "3.6" ]; then
-            echo "deb http://ppa.launchpad.net/gluster/glusterfs-3.6/ubuntu $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/glusterfs-3_6.list
-            echo "deb-src http://ppa.launchpad.net/gluster/glusterfs-3.6/ubuntu $(lsb_release -sc) main" | sudo tee --append /etc/apt/sources.list.d/glusterfs-3_6.list
-        elif [ "$1" == "3.7" ]; then
-            echo "deb http://ppa.launchpad.net/gluster/glusterfs-3.7/ubuntu $(lsb_release -sc) main" | sudo tee /etc/apt/sources.list.d/glusterfs-3_7.list
-            echo "deb-src http://ppa.launchpad.net/gluster/glusterfs-3.7/ubuntu $(lsb_release -sc) main" | sudo tee --append /etc/apt/sources.list.d/glusterfs-3_7.list
-        fi
+        sudo add-apt-repository ppa:gluster/glusterfs-6 -y
         NO_UPDATE_REPOS=False
         REPOS_UPDATED=False
     fi
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index bdbf1d5..5790041 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -21,8 +21,8 @@
 # - cleanup_glusterfs
 
 if [[ "$1" == "stack" && "$2" == "pre-install" ]]; then
-    echo_summary "Installing GlusterFS 3.7"
-    install_glusterfs 3.7
+    echo_summary "Installing GlusterFS"
+    install_glusterfs
 elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
     if is_service_enabled c-bak && [[ "$CONFIGURE_GLUSTERFS_CINDER_BACKUP" == "True" ]]; then
         echo_summary "Configuring GlusterFS as a backend for Cinder backup driver"