From: Kefu Chai <kchai@redhat.com>
Date: Mon, 22 Mar 2021 06:07:54 +0000 (+0800)
Subject: ceph.spec,install-deps: use golang-github-prometheus for promtools
X-Git-Tag: v14.2.22~25^2~10^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d6a1d1781bd003ecbf2c50a4eab27ed1d48f7771;p=ceph.git

ceph.spec,install-deps: use golang-github-prometheus for promtools

instead of installing docker for using promtools, install
golang-github-prometheus.

Signed-off-by: Aashish Sharma <aasharma@redhat.com>
Signed-off-by: Kefu Chai <kchai@redhat.com>
(cherry picked from commit e33e3a931db97d01318643ec686fe63fdd614082)

Conflicts:
	ceph.spec.in (#287-295 new changes overrid these lines, merged correctly now)
	install-deps.sh (changed dnf to yumdnf)
---

diff --git a/ceph.spec.in b/ceph.spec.in
index c944e0e07ae..6fe3977e04b 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -293,6 +293,7 @@ BuildRequires:  pyOpenSSL%{_python_buildid}
 %else
 BuildRequires:  python%{_python_buildid}-pyOpenSSL
 %endif
+BuildRequires:	golang-github-prometheus
 BuildRequires:	libtool-ltdl-devel
 BuildRequires:	python%{_python_buildid}-cherrypy
 BuildRequires:	python%{_python_buildid}-jwt
@@ -306,6 +307,7 @@ BuildRequires:	xmlsec1-openssl
 BuildRequires:	xmlsec1-openssl-devel
 %endif
 %if 0%{?suse_version}
+BuildRequires:	golang-github-prometheus-prometheus
 BuildRequires:	libxmlsec1-1
 BuildRequires:	libxmlsec1-nss1
 BuildRequires:	libxmlsec1-openssl1
diff --git a/install-deps.sh b/install-deps.sh
index 4d0cf4127fa..75631668991 100755
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -341,9 +341,6 @@ else
         case "$ID" in
             fedora)
                 $SUDO $yumdnf install -y $yumdnf-utils
-                $SUDO $yumdnf install -y docker-ce docker-ce-cli containerd.io
-                $SUDO systemctl start docker
-                $SUDO systemctl enable docker
                 ;;
             centos|rhel|ol|virtuozzo)
                 MAJOR_VERSION="$(echo $VERSION_ID | cut -d. -f1)"