lita-puppet 0.6.2 → 0.6.3
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/lita/handlers/puppet.rb +16 -8
- data/lita-puppet.gemspec +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: b07d8d6ec3d4b8bd50ded82552c693d7bd49eae3
|
|
4
|
+
data.tar.gz: ad15dc7734ef6ef1495d577377e295febfcaf865
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 572fd736a463d2d65060757a7b4c038fb1195aa82096431a57616018d3195818f08a0029c3687a0279bb65668570252d05474f71a59a9f576c023c134252547d
|
|
7
|
+
data.tar.gz: 32bc47bb56b0564729733dc00209715b51bf5764c342e7ce3fd46a28744a5939f0ae39d17bc7b72be75cc3e5bd956e250df784c1864163ef14afb35408b2e4db
|
data/lib/lita/handlers/puppet.rb
CHANGED
|
@@ -54,9 +54,10 @@ module Lita
|
|
|
54
54
|
result = cert_clean_result(config.master_hostname, config.ssh_user, cert)
|
|
55
55
|
|
|
56
56
|
if result[:exception]
|
|
57
|
-
fail_message t('replies.cert_clean.failure'), result[:exception].message
|
|
57
|
+
fail_message response, t('replies.cert_clean.failure'), result[:exception].message
|
|
58
58
|
else
|
|
59
59
|
success_message(
|
|
60
|
+
response,
|
|
60
61
|
t('replies.cert_clean.success'),
|
|
61
62
|
(result[:stdout] + result[:stderr]).join("\n")
|
|
62
63
|
)
|
|
@@ -72,9 +73,10 @@ module Lita
|
|
|
72
73
|
|
|
73
74
|
# build a reply
|
|
74
75
|
if result[:exception]
|
|
75
|
-
fail_message t('replies.puppet_agent_run.failure'), result[:exception].message
|
|
76
|
+
fail_message response, t('replies.puppet_agent_run.failure'), result[:exception].message
|
|
76
77
|
else
|
|
77
78
|
success_message(
|
|
79
|
+
response,
|
|
78
80
|
t('replies.puppet_agent_run.success', status: result[:exit_status]),
|
|
79
81
|
result[:stdout].join("\n")
|
|
80
82
|
)
|
|
@@ -95,9 +97,13 @@ module Lita
|
|
|
95
97
|
profiles = node_roles_and_profiles(url, host)
|
|
96
98
|
|
|
97
99
|
if profiles.is_a? String
|
|
98
|
-
fail_message t('replies.node_profiles.failure', error: profiles)
|
|
100
|
+
fail_message response, t('replies.node_profiles.failure', error: profiles)
|
|
99
101
|
else
|
|
100
|
-
success_message
|
|
102
|
+
success_message(
|
|
103
|
+
response,
|
|
104
|
+
t('replies.node_profiles.success', host: host),
|
|
105
|
+
profiles.join("\n")
|
|
106
|
+
)
|
|
101
107
|
end
|
|
102
108
|
end
|
|
103
109
|
|
|
@@ -114,9 +120,10 @@ module Lita
|
|
|
114
120
|
|
|
115
121
|
puppet_classes = class_nodes(url, class_camel(puppet_class))
|
|
116
122
|
if puppet_classes.empty?
|
|
117
|
-
fail_message t('replies.nodes_with_class.failure', pclass: puppet_class)
|
|
123
|
+
fail_message response, t('replies.nodes_with_class.failure', pclass: puppet_class)
|
|
118
124
|
else
|
|
119
125
|
success_message(
|
|
126
|
+
response,
|
|
120
127
|
t('replies.nodes_with_class.success', pclass: puppet_class),
|
|
121
128
|
puppet_classes.join("\n")
|
|
122
129
|
)
|
|
@@ -134,16 +141,17 @@ module Lita
|
|
|
134
141
|
result1 = r10k_git_result(config.master_hostname, user, config.control_repo_path)
|
|
135
142
|
|
|
136
143
|
if result1[:exception]
|
|
137
|
-
fail_message t('replies.r10k_deploy.gitfail'), result1[:exception].message
|
|
144
|
+
fail_message response, t('replies.r10k_deploy.gitfail'), result1[:exception].message
|
|
138
145
|
return false
|
|
139
146
|
end
|
|
140
147
|
|
|
141
148
|
result2 = simple_ssh_command(config.master_hostname, user, r10k_command(environment, mod))
|
|
142
149
|
|
|
143
150
|
if result2[:exception]
|
|
144
|
-
fail_message t('replies.r10k_deploy.pupfail'), result2[:exception].message
|
|
151
|
+
fail_message response, t('replies.r10k_deploy.pupfail'), result2[:exception].message
|
|
145
152
|
else
|
|
146
153
|
success_message(
|
|
154
|
+
response,
|
|
147
155
|
t('replies.r10k_deploy.success'),
|
|
148
156
|
[result1[:stdout].join("\n"), result2[:stderr].join("\n")].join("\n")
|
|
149
157
|
)
|
|
@@ -152,7 +160,7 @@ module Lita
|
|
|
152
160
|
|
|
153
161
|
private
|
|
154
162
|
|
|
155
|
-
def fail_message(message, data = nil)
|
|
163
|
+
def fail_message(response, message, data = nil)
|
|
156
164
|
response.reply_with_mention(message)
|
|
157
165
|
response.reply(as_code(data)) if data
|
|
158
166
|
end
|
data/lita-puppet.gemspec
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Gem::Specification.new do |spec|
|
|
2
2
|
spec.name = 'lita-puppet'
|
|
3
|
-
spec.version = '0.6.
|
|
3
|
+
spec.version = '0.6.3'
|
|
4
4
|
spec.authors = ['Daniel Schaaff', 'Jonathan Gnagy'].sort
|
|
5
5
|
spec.email = ['jgnagy@knuedge.com']
|
|
6
6
|
spec.description = 'Some basic Puppet interactions for Lita'
|