smart_proxy_salt 2.1.7 → 2.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a479ace7ffeb895281d60a176b7f47c5ed96975
-  data.tar.gz: af15fc5c2a9072e3e7a70dc57b520895b2f94276
+  metadata.gz: 3617d7030f84c637b456820c2ed126a46a0891f8
+  data.tar.gz: e38b6cbe39839ac23e9b734fd1b72ee5baeb10fb
 SHA512:
-  metadata.gz: 5c84eaea9f1a759457655941dd8a5c053543968bea016fe5e8301629d852c947a69ede9b8f331c6f4871c7fcc7484317d2efe5613323b3cbe0ba22c4351038b7
-  data.tar.gz: 8a77baac462e5697879b14fbcec1a96d9b93a7cdca86f527aafb84edf47519bdf2b7b5c72a60322538d7b32c3e638e0af19d66b071885c491d3778c7ea98b113
+  metadata.gz: 5b4b844c9a4463aa77ca9769028fd5d32d9efa933c4ecc6cf90391ab437f78936a7882583f548bfa338c33dfd4731e27fba5f1d233e650521aaf3411888cf824
+  data.tar.gz: 657c0199e6aea9a2fefdcc4847f2a7107ba4dd1fbf28c2e7413a4119a09c79680e69a5ed569e13f2e854a07096ba82bc8e8e69752ea5e3b1b9fbf26f47f57c45

data/bin/foreman-node

@@ -172,7 +172,7 @@ def enc(minion)
       http.cert = OpenSSL::X509::Certificate.new(File.read(SETTINGS[:ssl_cert]))
       http.key  = OpenSSL::PKey::RSA.new(File.read(SETTINGS[:ssl_key]), nil)
     end
-  elsif SETTINGS[:username] && SETTING[:password]
+  elsif SETTINGS[:username] && SETTINGS[:password]
     req.basic_auth(SETTINGS[:username], SETTINGS[:password])
   end
 

data/lib/smart_proxy_salt/version.rb

@@ -1,5 +1,5 @@
 module Proxy
   module Salt
-    VERSION = '2.1.7'
+    VERSION = '2.1.8'
   end
 end

data/sbin/upload-salt-reports

@@ -5,7 +5,6 @@ LAST_UPLOADED = '/etc/salt/last_uploaded'
 FOREMAN_CONFIG = '/etc/salt/foreman.yaml'
 LOCK_FILE = '/var/lock/salt-report-upload.lock'
 
-import urllib
 import httplib
 import ssl
 import json
@@ -27,7 +26,7 @@ def salt_config():
 
 
 def get_job(job_id):
-    result = run('jobs.lookup_jid', argument=[job_id])
+    result = run('jobs.lookup_jid', [job_id])
 
     # If any minion's results are strings, they're exceptions
     # and should be wrapped in a list like other errors
@@ -64,31 +63,31 @@ def write_last_uploaded(last_uploaded):
         f.write(last_uploaded)
 
 
-def run(function, argument=[]):
+def run(*args, **kwargs):
     __opts__ = salt.config.master_config(
             os.environ.get('SALT_MASTER_CONFIG', '/etc/salt/master'))
 
     runner = salt.runner.Runner(__opts__)
-    stdout_bak = sys.stdout
     with open(os.devnull, 'wb') as f:
-        sys.stdout = f
-        ret = runner.cmd(function, argument)
-    sys.stdout = stdout_bak
+        stdout_bak, sys.stdout = sys.stdout, f
+        try:
+            ret = runner.cmd(*args, **kwargs)
+        finally:
+            sys.stdout = stdout_bak
     return ret['data'] if 'data' in ret else ret
 
 
 def jobs_to_upload():
-    jobs = run('jobs.list_jobs')
+    jobs = run('jobs.list_jobs', kwarg={
+        "search_function": "state.highstate",
+    })
     last_uploaded = read_last_uploaded()
 
-    job_ids = [id for (id, value) in jobs.iteritems()
-            if value['Function'] == 'state.highstate' and
-            int(id) > last_uploaded]
+    job_ids = [jid for (jid, value) in jobs.iteritems()
+               if int(jid) > last_uploaded]
 
-    jobs = dict([(job, get_job(job)) for job in job_ids])
-    ids = sorted(jobs.keys())
-
-    return (ids, jobs)
+    for job_id in sorted(job_ids):
+        yield job_id, get_job(job_id)
 
 
 def upload(jobs):
@@ -111,8 +110,7 @@ def upload(jobs):
                                                     config[':password']))
             headers['Authorization'] = 'Basic {}'.format(token)
 
-    for id in jobs[0]:
-        job = jobs[1][id]
+    for job_id, job in jobs:
 
         if job['job']['result'] == {}:
             continue
@@ -122,8 +120,8 @@ def upload(jobs):
         response = connection.getresponse()
 
         if response.status == 200:
-            write_last_uploaded(id)
-            print "Success %s: %s" % (id, response.read())
+            write_last_uploaded(job_id)
+            print "Success %s: %s" % (job_id, response.read())
         else:
             print "Unable to upload job - aborting report upload"
             print response.read()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_salt
 version: !ruby/object:Gem::Version
-  version: 2.1.7
+  version: 2.1.8
 platform: ruby
 authors:
 - Michael Moll
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-07 00:00:00.000000000 Z
+date: 2017-03-29 00:00:00.000000000 Z
 dependencies: []
 description: SaltStack Plug-In for Foreman's Smart Proxy
 email: foreman-dev@googlegroups.com
@@ -56,7 +56,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: SaltStack Plug-In for Foreman's Smart Proxy