smart_proxy_salt 2.1.4 → 2.1.5

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 902cfa4cb65f7fb7ad39da9420a7551d0980fd3a
4
- data.tar.gz: 59eb6881d468f5cdba5fd987024ee8097543cd20
3
+ metadata.gz: e255d683c311800e1fb0f1b7c7b8a41c8ec7bdfd
4
+ data.tar.gz: eacec2c23cb46cffb25c41a844fe4b50be2a5056
5
5
  SHA512:
6
- metadata.gz: 176b7c1ab862163ca1bcbbe841eabd1b0294ade33a2e8d4ffc95924dbe5cc037d4652eda9bfb5686617499cda94f4ac5b67c946e92327c963e302168e9e3241b
7
- data.tar.gz: f3b785ab1cf0916d0f68c4b015d0cf2ddd93dd82f4540dd7acabdf212181a68ca37f02c1ad80ef45c68984451b7a13f3ba8ad4df19762df24a86523bf3ca55fd
6
+ metadata.gz: 28524b9c4463caa662bf6492d77ba2f5eb3ee1fd7cd4b1bf2cf8b5c902d8d664fa6155334b8b4743ce7f508dfa68f23c87ca1d44d9f3d61557ed5897c8fb37a6
7
+ data.tar.gz: 05f43fb0b863d48f28f537daa617053ff5427ce84d01c2c35810c5af9ac2e5f461a82282b7062a1081a4253fe481c738ff7bce0f8ca2d4a9ab97ecc1592b668a
@@ -1,5 +1,5 @@
1
1
  module Proxy
2
2
  module Salt
3
- VERSION = '2.1.4'
3
+ VERSION = '2.1.5'
4
4
  end
5
5
  end
@@ -25,9 +25,17 @@ def salt_config():
25
25
 
26
26
 
27
27
  def get_job(job_id):
28
+ result = run('jobs.lookup_jid', argument=[job_id])
29
+
30
+ # If any minion's results are strings, they're exceptions
31
+ # and should be wrapped in a list like other errors
32
+ for minion, value in result.iteritems():
33
+ if type(value) == str:
34
+ result[minion] = [value]
35
+
28
36
  return {'job':
29
37
  {
30
- 'result': run('jobs.lookup_jid', argument=[job_id]),
38
+ 'result': result,
31
39
  'function': 'state.highstate',
32
40
  'job_id': job_id
33
41
  }
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: smart_proxy_salt
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.1.4
4
+ version: 2.1.5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Michael Moll
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2015-08-13 00:00:00.000000000 Z
12
+ date: 2015-08-31 00:00:00.000000000 Z
13
13
  dependencies: []
14
14
  description: SaltStack Plug-In for Foreman's Smart Proxy
15
15
  email: foreman-dev@googlegroups.com