From bcb94f3093832bd3376aeb4abbc07ad9feae1856 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Mon, 22 Mar 2021 14:07:54 +0800 Subject: [PATCH] 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 Signed-off-by: Kefu Chai (cherry picked from commit e33e3a931db97d01318643ec686fe63fdd614082) --- ceph.spec.in | 2 ++ install-deps.sh | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/ceph.spec.in b/ceph.spec.in index 39935289ab420..718421ca901de 100644 --- a/ceph.spec.in +++ b/ceph.spec.in @@ -328,6 +328,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 @@ -344,6 +345,7 @@ BuildRequires: python%{python3_pkgversion}-werkzeug BuildRequires: python%{python3_pkgversion}-pyOpenSSL %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 c5bd79e0e33f6..73242df8fb8ba 100755 --- a/install-deps.sh +++ b/install-deps.sh @@ -344,9 +344,6 @@ else case "$ID" in fedora) $SUDO dnf install -y dnf-utils - $SUDO dnf 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)" -- 2.39.5