Merge pull request #15679 from thatch45/ssh_static

Add --static to salt-ssh

salt/client/ssh/__init__.py

@@ -451,12 +451,17 @@ class SSH(object):
             print(msg)
             print('-' * len(msg) + '\n')
             print('')
+        sret = {}
+        outputter = self.opts.get('output', 'nested')
         for ret in self.handle_ssh():
             host = ret.keys()[0]
             self.cache_job(jid, host, ret[host])
             ret = self.key_deploy(host, ret)
             outputter = ret[host].get('out', self.opts.get('output', 'nested'))
             p_data = {host: ret[host].get('return', {})}
+            if self.opts.get('static'):
+                sret.update(p_data)
+            else:
                 salt.output.display_output(
                         p_data,
                         outputter,
@@ -467,6 +472,11 @@ class SSH(object):
                         salt.utils.event.tagify(
                             [jid, 'ret', host],
                             'job'))
+        if self.opts.get('static'):
+            salt.output.display_output(
+                    sret,
+                    outputter,
+                    self.opts)
 
 
 class Single(object):

salt/utils/parsers.py

@@ -2183,6 +2183,13 @@ class SaltSSHOptionParser(OptionParser, ConfigDirMixIn, MergeConfigMixIn,
             action='store_true',
             help=('Turn on command verbosity, display jid')
         )
+        self.add_option(
+            '-s', '--static',
+            default=False,
+            action='store_true',
+            help=('Return the data from minions as a group after they '
+                  'all return.')
+        )
 
         auth_group = optparse.OptionGroup(
             self, 'Authentication Options',