From: Kefu Chai <kchai@redhat.com>
Date: Thu, 12 Mar 2020 05:59:01 +0000 (+0800)
Subject: install-deps.sh: install rhel-7-server-optional-rpms on el7 only
X-Git-Tag: v15.1.1~4^2~2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=25b47150f742bd440d1dd67e0ea4077529fed6da;p=ceph.git

install-deps.sh: install rhel-7-server-optional-rpms on el7 only

RHEL8 uses appstream and supplementary repos for those optional-rpms.

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/install-deps.sh b/install-deps.sh
index ec955c019aa3..c725b6ee3863 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -341,9 +341,6 @@ else
             centos|rhel|ol|virtuozzo)
                 MAJOR_VERSION="$(echo $VERSION_ID | cut -d. -f1)"
                 $SUDO $yumdnf install -y $yumdnf-utils
-                if test $ID = rhel ; then
-                    $SUDO yum-config-manager --enable rhel-$MAJOR_VERSION-server-optional-rpms
-                fi
                 rpm --quiet --query epel-release || \
 		    $SUDO $yumdnf -y install --nogpgcheck https://dl.fedoraproject.org/pub/epel/epel-release-latest-$MAJOR_VERSION.noarch.rpm
                 $SUDO rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-EPEL-$MAJOR_VERSION
@@ -364,6 +361,7 @@ else
                 elif test $ID = rhel -a $MAJOR_VERSION = 7 ; then
                     $SUDO yum-config-manager \
 			  --enable rhel-server-rhscl-7-rpms \
+			  --enable rhel-7-server-optional-rpms \
 			  --enable rhel-7-server-devtools-rpms
                     dts_ver=8
                 elif test $ID = centos -a $MAJOR_VERSION = 8 ; then