Merge PR ceph#31806 into master

* refs/pull/31806/head: spec,debian: ceph-mgr-ssh depends on openssh{-client{s}} Reviewed-by: Kefu Chai <[email protected]> Reviewed-by: Nathan Cutler <[email protected]> Reviewed-by: Dimitri Savineau <[email protected]>
joskid · Nov 24, 2019 · 582d713 · 582d713
2 parents 7d4675d + e690931
commit 582d713
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 0 deletions.
diff --git a/.githubmap b/.githubmap
@@ -107,3 +107,4 @@ guits Guillaume Abrioux <[email protected]>
 mgfritch Michael Fritch <[email protected]>
 xiaoxichen Xiaoxi Chen <[email protected]>
 toabctl Thomas Bechtold <[email protected]>
+dsavineau Dimitri Savineau <[email protected]>
diff --git 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
@@ -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,