Merge PR #26262 into master

* refs/pull/26262/head:
	mgr/orch/ssh: add qa test
	qa: install/exclude ceph-mgr-ssh package
	debian: package ssh orchestrator
	spec.ceph: package ssh orchestrator
	ssh/orch: add ssh orchestrator

4 files changed, 69 insertions, 1 deletions

diff --git a/debian/ceph-mgr-ssh.install b/debian/ceph-mgr-ssh.install
new file mode 100644
index 00000000000..4023e4ead43
--- /dev/null
+++ b/debian/ceph-mgr-ssh.install
@@ -0,0 +1 @@
+usr/share/ceph/mgr/ssh
diff --git a/debian/ceph-mgr-ssh.postinst b/debian/ceph-mgr-ssh.postinst
new file mode 100644
index 00000000000..c0e3b13c5b1
--- /dev/null
+++ b/debian/ceph-mgr-ssh.postinst
@@ -0,0 +1,43 @@
+#!/bin/sh
+# vim: set noet ts=8:
+# postinst script for ceph-mgr-ssh
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#
+# 	postinst configure <most-recently-configured-version>
+# 	old-postinst abort-upgrade <new-version>
+# 	conflictor's-postinst abort-remove in-favour <package> <new-version>
+# 	postinst abort-remove
+# 	deconfigured's-postinst abort-deconfigure in-favour <failed-install-package> <version> [<removing conflicting-package> <version>]
+#
+
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+case "$1" in
+    configure)
+	# attempt to load the plugin if the mgr is running
+	deb-systemd-invoke try-restart ceph-mgr.target
+    ;;
+    abort-upgrade|abort-remove|abort-deconfigure)
+	:
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+
diff --git a/debian/ceph-mgr-ssh.prerm b/debian/ceph-mgr-ssh.prerm
new file mode 100644
index 00000000000..e8e9959b1f3
--- /dev/null
+++ b/debian/ceph-mgr-ssh.prerm
@@ -0,0 +1,8 @@
+#!/bin/sh
+# vim: set noet ts=8:
+
+set -e
+
+#DEBHELPER#
+
+exit 0
diff --git a/debian/control b/debian/control
index 082ab0ad5f5..304aee71d13 100644
--- a/debian/control
+++ b/debian/control
@@ -191,7 +191,8 @@ Depends: ceph-base (= ${binary:Version}),
 Recommends: ceph-mgr-dashboard,
             ceph-mgr-diskprediction-local,
             ceph-mgr-diskprediction-cloud,
-            ceph-mgr-rook
+            ceph-mgr-rook,
+            ceph-mgr-ssh
 Suggests: python-influxdb
 Replaces: ceph (<< 0.93-417),
 Breaks: ceph (<< 0.93-417),
@@ -273,6 +274,21 @@ Description: rook plugin for ceph-mgr
  functionality, to allow ceph-mgr to install and configure ceph using
  Rook.
 
+Package: ceph-mgr-ssh
+Architecture: all
+Depends: ceph-mgr (= ${binary:Version}),
+	 python-six,
+         ${misc:Depends},
+         ${python:Depends},
+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,
+ block and file system storage.
+ .
+ This package contains the SSH plugin for ceph-mgr's orchestration
+ functionality, to allow ceph-mgr to perform orchestration functions
+ over a standard SSH connection.
+
 Package: ceph-mgr-dbg
 Architecture: linux-any
 Section: debug