x/devstack-plugin-glusterfs
Code Issues Proposed changes

install gluster packages specific to a Ubuntu version

Browse Source 
Previously, for a Ubuntu host, "trusty"-specific gluster packages
were installed regardless of the actual Ubuntu version.

Closes-Bug: #1616382
Change-Id: I41b29913dc6836ab0c6bedc39b6f85e041d7586a
This commit is contained in:
Ramana Raja 2016-08-24 14:06:59 +05:30
parent 2a7be431ba
commit 0ec721689c
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
devstack/gluster-functions.sh
View File

@ -9,13 +9,14 @@ function install_glusterfs {
if [[ ${DISTRO} =~ rhel7 ]] && [[ ! -f /etc/yum.repos.d/glusterfs-epel.repo ]]; then 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 sudo wget $GLUSTERFS_CENTOS_REPO -O /etc/yum.repos.d/glusterfs-epel.repo
elif is_ubuntu; then elif is_ubuntu; then
RELEASE_CODE_NAME=$(lsb_release -c | cut -d ':' -f 2 | sed 's/^[ \t]*//')
sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 3FE869A9 sudo apt-key adv --keyserver keyserver.ubuntu.com --recv 3FE869A9
if [ "$1" == "3.6" ]; then if [ "$1" == "3.6" ]; then
echo "deb http://ppa.launchpad.net/gluster/glusterfs-3.6/ubuntu trusty main" | sudo tee /etc/apt/sources.list.d/glusterfs-3_6-trusty.list echo "deb http://ppa.launchpad.net/gluster/glusterfs-3.6/ubuntu $RELEASE_CODE_NAME main" | sudo tee /etc/apt/sources.list.d/glusterfs-3_6-$RELEASE_CODE_NAME.list
echo "deb-src http://ppa.launchpad.net/gluster/glusterfs-3.6/ubuntu trusty main" | sudo tee --append /etc/apt/sources.list.d/glusterfs-3_6-trusty.list echo "deb-src http://ppa.launchpad.net/gluster/glusterfs-3.6/ubuntu $RELEASE_CODE_NAME main" | sudo tee --append /etc/apt/sources.list.d/glusterfs-3_6-$RELEASE_CODE_NAME.list
elif [ "$1" == "3.7" ]; then elif [ "$1" == "3.7" ]; then
echo "deb http://ppa.launchpad.net/gluster/glusterfs-3.7/ubuntu trusty main" | sudo tee /etc/apt/sources.list.d/glusterfs-3_7-trusty.list echo "deb http://ppa.launchpad.net/gluster/glusterfs-3.7/ubuntu $RELEASE_CODE_NAME main" | sudo tee /etc/apt/sources.list.d/glusterfs-3_7-$RELEASE_CODE_NAME.list
echo "deb-src http://ppa.launchpad.net/gluster/glusterfs-3.7/ubuntu trusty main" | sudo tee --append /etc/apt/sources.list.d/glusterfs-3_7-trusty.list echo "deb-src http://ppa.launchpad.net/gluster/glusterfs-3.7/ubuntu $RELEASE_CODE_NAME main" | sudo tee --append /etc/apt/sources.list.d/glusterfs-3_7-$RELEASE_CODE_NAME.list
fi fi
NO_UPDATE_REPOS=False NO_UPDATE_REPOS=False
REPOS_UPDATED=False REPOS_UPDATED=False