smart_proxy_ansible 3.6.1 → 3.7.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/smart_proxy_ansible/runner/ansible_runner.rb +11 -4
- data/lib/smart_proxy_ansible/version.rb +1 -1
- metadata +25 -16
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5485a4ab8fc4f53bc9cacdcabf3fb6bd9181e2389686c4da6dee9d6586b54cf2
|
|
4
|
+
data.tar.gz: fbd95ce8ef2496a94d92cb51d50d6c32eb2ae0dc9cd5bb5620eb0aaf93f9bb88
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f13d23b788defd429202867247a12e0ee538990a77076b83d2db304e2a147a58f989b0651c787c168c098451bd4ef7db31ea4289597b2bbdb75028fd61fff5a8
|
|
7
|
+
data.tar.gz: d8694581e202966086f7766fbacc66cfebcaa4b038d50e66ab644db4776bab48279b80a513ce74db5530444672f6c43d48841938f7ec6f06421bd8e945466116
|
|
@@ -130,7 +130,7 @@ module Proxy::Ansible
|
|
|
130
130
|
|
|
131
131
|
def handle_host_event(hostname, event)
|
|
132
132
|
log_event("for host: #{hostname.inspect}", event)
|
|
133
|
-
publish_data_for(hostname, event['stdout'] + "\n", 'stdout') if event['stdout']
|
|
133
|
+
publish_data_for(hostname, event['stdout'] + "\n", 'stdout', id: event['uuid'], timestamp: parse_timestamp(event['created'])) if event['stdout']
|
|
134
134
|
case event['event']
|
|
135
135
|
when 'runner_on_ok'
|
|
136
136
|
publish_exit_status_for(hostname, 0) if @exit_statuses[hostname].nil?
|
|
@@ -156,11 +156,11 @@ module Proxy::Ansible
|
|
|
156
156
|
host = inventory_hosts.find { |host| row =~ /#{host}/ }
|
|
157
157
|
line = row + "\n"
|
|
158
158
|
unless host
|
|
159
|
-
broadcast_data(line, 'stdout')
|
|
159
|
+
broadcast_data(line, 'stdout', id: event['uuid'], timestamp: parse_timestamp(event['created']))
|
|
160
160
|
next
|
|
161
161
|
end
|
|
162
162
|
|
|
163
|
-
publish_data_for(host, line, 'stdout')
|
|
163
|
+
publish_data_for(host, line, 'stdout', id: event['uuid'], timestamp: parse_timestamp(event['created']))
|
|
164
164
|
|
|
165
165
|
# If the task has been rescued, it won't consider a failure
|
|
166
166
|
if @exit_statuses[host].to_i != 0 && failures[host].to_i <= 0 && unreachable[host].to_i <= 0 && rescued[host].to_i > 0
|
|
@@ -168,7 +168,7 @@ module Proxy::Ansible
|
|
|
168
168
|
end
|
|
169
169
|
end
|
|
170
170
|
else
|
|
171
|
-
broadcast_data(event['stdout'] + "\n", 'stdout')
|
|
171
|
+
broadcast_data(event['stdout'] + "\n", 'stdout', id: event['uuid'], timestamp: parse_timestamp(event['created']))
|
|
172
172
|
end
|
|
173
173
|
|
|
174
174
|
# If the run ends early due to an error - fail all other tasks
|
|
@@ -383,6 +383,13 @@ module Proxy::Ansible
|
|
|
383
383
|
host_data["ansible_port"]
|
|
384
384
|
].compact.uniq
|
|
385
385
|
end
|
|
386
|
+
|
|
387
|
+
def parse_timestamp(ts)
|
|
388
|
+
Time.iso8601(ts)
|
|
389
|
+
rescue ArgumentError
|
|
390
|
+
logger.warn("Failed to parse '#{ts}' (#{ts.class}) as iso8601 timestamp, defaulting to current timestamp")
|
|
391
|
+
Time.now.getlocal
|
|
392
|
+
end
|
|
386
393
|
end
|
|
387
394
|
end
|
|
388
395
|
end
|
metadata
CHANGED
|
@@ -1,15 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: smart_proxy_ansible
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.
|
|
4
|
+
version: 3.7.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Ivan Nečas
|
|
8
8
|
- Daniel Lobato
|
|
9
|
-
autorequire:
|
|
10
9
|
bindir: bin
|
|
11
10
|
cert_chain: []
|
|
12
|
-
date:
|
|
11
|
+
date: 1980-01-02 00:00:00.000000000 Z
|
|
13
12
|
dependencies:
|
|
14
13
|
- !ruby/object:Gem::Dependency
|
|
15
14
|
name: rake
|
|
@@ -29,30 +28,42 @@ dependencies:
|
|
|
29
28
|
name: smart_proxy_dynflow
|
|
30
29
|
requirement: !ruby/object:Gem::Requirement
|
|
31
30
|
requirements:
|
|
32
|
-
- - "
|
|
31
|
+
- - ">="
|
|
32
|
+
- !ruby/object:Gem::Version
|
|
33
|
+
version: 0.9.4
|
|
34
|
+
- - "<"
|
|
33
35
|
- !ruby/object:Gem::Version
|
|
34
|
-
version:
|
|
36
|
+
version: 1.0.0
|
|
35
37
|
type: :runtime
|
|
36
38
|
prerelease: false
|
|
37
39
|
version_requirements: !ruby/object:Gem::Requirement
|
|
38
40
|
requirements:
|
|
39
|
-
- - "
|
|
41
|
+
- - ">="
|
|
40
42
|
- !ruby/object:Gem::Version
|
|
41
|
-
version:
|
|
43
|
+
version: 0.9.4
|
|
44
|
+
- - "<"
|
|
45
|
+
- !ruby/object:Gem::Version
|
|
46
|
+
version: 1.0.0
|
|
42
47
|
- !ruby/object:Gem::Dependency
|
|
43
48
|
name: smart_proxy_remote_execution_ssh
|
|
44
49
|
requirement: !ruby/object:Gem::Requirement
|
|
45
50
|
requirements:
|
|
46
|
-
- - "
|
|
51
|
+
- - ">="
|
|
47
52
|
- !ruby/object:Gem::Version
|
|
48
|
-
version:
|
|
53
|
+
version: 0.5.0
|
|
54
|
+
- - "<"
|
|
55
|
+
- !ruby/object:Gem::Version
|
|
56
|
+
version: 2.0.0
|
|
49
57
|
type: :runtime
|
|
50
58
|
prerelease: false
|
|
51
59
|
version_requirements: !ruby/object:Gem::Requirement
|
|
52
60
|
requirements:
|
|
53
|
-
- - "
|
|
61
|
+
- - ">="
|
|
62
|
+
- !ruby/object:Gem::Version
|
|
63
|
+
version: 0.5.0
|
|
64
|
+
- - "<"
|
|
54
65
|
- !ruby/object:Gem::Version
|
|
55
|
-
version:
|
|
66
|
+
version: 2.0.0
|
|
56
67
|
description: " Smart-Proxy ansible plugin\n"
|
|
57
68
|
email:
|
|
58
69
|
- inecas@redhat.com
|
|
@@ -60,8 +71,8 @@ email:
|
|
|
60
71
|
executables: []
|
|
61
72
|
extensions: []
|
|
62
73
|
extra_rdoc_files:
|
|
63
|
-
- README.md
|
|
64
74
|
- LICENSE
|
|
75
|
+
- README.md
|
|
65
76
|
files:
|
|
66
77
|
- LICENSE
|
|
67
78
|
- README.md
|
|
@@ -87,7 +98,6 @@ homepage: https://github.com/theforeman/smart_proxy_ansible
|
|
|
87
98
|
licenses:
|
|
88
99
|
- GPL-3.0-only
|
|
89
100
|
metadata: {}
|
|
90
|
-
post_install_message:
|
|
91
101
|
rdoc_options: []
|
|
92
102
|
require_paths:
|
|
93
103
|
- lib
|
|
@@ -95,15 +105,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
|
95
105
|
requirements:
|
|
96
106
|
- - ">="
|
|
97
107
|
- !ruby/object:Gem::Version
|
|
98
|
-
version: '
|
|
108
|
+
version: '3.0'
|
|
99
109
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
|
100
110
|
requirements:
|
|
101
111
|
- - ">="
|
|
102
112
|
- !ruby/object:Gem::Version
|
|
103
113
|
version: '0'
|
|
104
114
|
requirements: []
|
|
105
|
-
rubygems_version: 3.
|
|
106
|
-
signing_key:
|
|
115
|
+
rubygems_version: 3.6.9
|
|
107
116
|
specification_version: 4
|
|
108
117
|
summary: Smart-Proxy Ansible plugin
|
|
109
118
|
test_files: []
|