diff --git a/devstack/gluster-functions.sh b/devstack/gluster-functions.sh
index 764b086..29c8b7a 100755
--- a/devstack/gluster-functions.sh
+++ b/devstack/gluster-functions.sh
@@ -8,7 +8,7 @@ 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 add-apt-repository ppa:gluster/glusterfs-6 -y
+        sudo add-apt-repository ppa:gluster/glusterfs-7 -y
         NO_UPDATE_REPOS=False
         REPOS_UPDATED=False
     fi
@@ -16,31 +16,21 @@ function install_glusterfs {
     install_package glusterfs-server
     install_package xfsprogs
 
-    if is_fedora; then
-        stop_glusterfs
-        _start_glusterfs
-    fi
+    stop_glusterfs
+    _start_glusterfs
 
     _create_glusterfs_disk
 }
 
 # Start gluster service
 function _start_glusterfs {
-    if is_ubuntu; then
-        sudo service glusterfs-server start
-    else
-        sudo service glusterd start
-    fi
+    sudo systemctl start glusterd
 }
 
 # Stop running gluster service
 # Triggered from devstack/plugin.sh as part of devstack "unstack"
 function stop_glusterfs {
-    if is_ubuntu; then
-        sudo service glusterfs-server stop
-    else
-        sudo service glusterd stop
-    fi
+    sudo systemctl stop glusterd
 }
 
 # Clean Shares
@@ -153,7 +143,7 @@ function cleanup_glusterfs {
 # Setting up glusterfs
 function _create_glusterfs_disk {
     # create a backing file disk
-    local disk_image_directory=$(dirname "${GLUSTERFS_DISK_IMAGE}")
+    disk_image_directory=$(dirname "${GLUSTERFS_DISK_IMAGE}")
     mkdir -p $disk_image_directory
     create_disk ${GLUSTERFS_DISK_IMAGE} ${GLUSTERFS_DATA_DIR} ${GLUSTERFS_LOOPBACK_DISK_SIZE}
 }