From: Sebastian Wagner <sebastian.wagner@suse.com>
Date: Fri, 22 Nov 2019 09:13:29 +0000 (+0100)
Subject: spec,debian: ceph-mgr-ssh depends on openssh{-client{s}}
X-Git-Tag: v15.1.0~781^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e6909311bdf74322498586ae12ec57efb7ee1afb;p=ceph.git

spec,debian: ceph-mgr-ssh depends on openssh{-client{s}}

Container images don't include ssh by default. Thus we
have to explictly depend on it.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
---

diff --git a/ceph.spec.in b/ceph.spec.in
index bc2fc59fed4b..aa39ab9769d2 100644
--- a/ceph.spec.in
+++ b/ceph.spec.in
@@ -604,6 +604,12 @@ Group:          System/Filesystems
 Requires:       ceph-mgr = %{_epoch_prefix}%{version}-%{release}
 Requires:       python%{_python_buildid}-remoto
 Requires:       ceph-daemon = %{_epoch_prefix}%{version}-%{release}
+%if 0%{?suse_version}
+Requires:       openssh
+%endif
+%if 0%{?rhel} || 0%{?fedora}
+Requires:       openssh-clients
+%endif
 %description mgr-ssh
 ceph-mgr-ssh is a ceph-mgr module for orchestration functions using
 direct SSH connections for management operations.
diff --git a/debian/control b/debian/control
index d1e549ea2b8d..6fd1e6c3f135 100644
--- a/debian/control
+++ b/debian/control
@@ -333,6 +333,7 @@ Depends: ceph-mgr (= ${binary:Version}),
 	 python-six,
          ${misc:Depends},
          ${python:Depends},
+         openssh-client
 Description: ssh orchestrator plugin for ceph-mgr
  Ceph is a massively scalable, open-source, distributed
  storage system that runs on commodity hardware and delivers object,