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:
	install-deps.sh (changed dnf to yumdnf)

diff --git a/ceph.spec.in b/ceph.spec.in
index 63e381b68865fd406e3a25d8cd1d75f114ef5416..433e316f960211e20aa3a0eb832b32251fabc24f 100644 (file)
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -297,6 +297,7 @@ BuildRequires:      lz4-devel >= 1.7
 # distro-conditional make check dependencies
 %if 0%{with make_check}
 %if 0%{?fedora} || 0%{?rhel}
+BuildRequires: golang-github-prometheus
 BuildRequires: libtool-ltdl-devel
 BuildRequires: xmlsec1
 BuildRequires: xmlsec1-devel
@@ -322,6 +323,7 @@ BuildRequires:      python%{python3_pkgversion}-pyOpenSSL
 %endif
 %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 24c198b40a03dec5a329c3f6fed9b7d5a9ce7a04..f617e12fec89febb18c3e076e87a77913fe6dd6d 100755 (executable)
--- a/install-deps.sh
+++ b/install-deps.sh
@@ -344,10 +344,7 @@ else
        fi
         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
+                $SUDO $yumdnf install -y dnf-utils
                 ;;
             centos|rhel|ol|virtuozzo)
                 MAJOR_VERSION="$(echo $VERSION_ID | cut -d. -f1)"