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 c944e0e07ae139946f8fd43aa5bec50a75f887b2..6fe3977e04bde61b9635f14bf9a9e43fd2688c1a 100644 (file)
--- 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 4d0cf4127fa02442c516c7e318f58e17a62dcee3..7563166899134bc37da5dbf72e4d2232d9650fa3 100755 (executable)
--- 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)"