From: Zack Cerza <zack@redhat.com>
Date: Fri, 1 Feb 2019 00:36:17 +0000 (+0000)
Subject: install-deps.sh: Fixes for RHEL 7
X-Git-Tag: v13.2.7~139^2~19
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f73d9a1196565bec536fda008f3a3988fcded9c8;p=ceph.git

install-deps.sh: Fixes for RHEL 7

Signed-off-by: Zack Cerza <zack@redhat.com>
(cherry picked from commit a1a3e7960cf2c792ac8c9c71e68caa0ebada8933)

Conflicts:
	install-deps.sh
---

diff --git a/install-deps.sh b/install-deps.sh
index 1f31eba7513..e609755636d 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -215,15 +215,16 @@ else
                 fi
                 ;;
             centos|rhel|ol|virtuozzo)
+                MAJOR_VERSION="$(echo $VERSION_ID | cut -d. -f1)"
                 $SUDO yum install -y yum-utils
                 if test $ID = rhel ; then
-                    $SUDO yum-config-manager --enable rhel-$VERSION_ID-server-optional-rpms
+                    $SUDO yum-config-manager --enable rhel-$MAJOR_VERSION-server-optional-rpms
                 fi
-                $SUDO yum-config-manager --add-repo https://dl.fedoraproject.org/pub/epel/$VERSION_ID/x86_64/
+                $SUDO yum-config-manager --add-repo https://dl.fedoraproject.org/pub/epel/$MAJOR_VERSION/x86_64/
                 $SUDO yum install --nogpgcheck -y epel-release
-                $SUDO rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$VERSION_ID
+                $SUDO rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$MAJOR_VERSION
                 $SUDO rm -f /etc/yum.repos.d/dl.fedoraproject.org*
-                if test $ID = centos -a $VERSION_ID = 7 ; then
+                if test $ID = centos -a $MAJOR_VERSION = 7 ; then
 		    $SUDO $yumdnf install -y python36-devel
 		    case $(uname -m) in
 			x86_64)