cfnpp 0.3.2 → 0.3.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/cfnpp +21 -16
- 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: af60c0387ee33a9677531c37ed708f92d2812adb
|
4
|
+
data.tar.gz: 698ce4ab50f8b32bc863ed43b79e4fe6e40fd147
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 8899a3325476f21357ad225f404038219e7b557e09f5ec5162a54f0aace49a778fa3bba14b3a7a9df680b43d5b4bfafda2be1d730f8d062f43eb6b78603d2ef5
|
7
|
+
data.tar.gz: 336491a80dcc6d5f8de0769ca27ace7b62847a2a2bca9aa3fd0f609d7c3528e80f6446a160bce0aef8dc0533a76989a0a36b0ea79f2ecbdb91f96b7419f2fa79
|
data/bin/cfnpp
CHANGED
@@ -55,14 +55,19 @@ eot
|
|
55
55
|
optparse.parse!
|
56
56
|
|
57
57
|
if cli_opts[:deployconfig]
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
63
|
-
|
64
|
-
|
65
|
-
|
58
|
+
begin
|
59
|
+
yr = Ploy::YamlReader.new
|
60
|
+
conf = yr.from_http(cli_opts[:deployconfig])
|
61
|
+
if (conf['locked'])
|
62
|
+
puts "skipping autoupdate: deployconfig is locked"
|
63
|
+
exit
|
64
|
+
end
|
65
|
+
unless (conf['stack_autoupdate'])
|
66
|
+
puts "skipping autoupdate: autoupdate is false"
|
67
|
+
exit
|
68
|
+
end
|
69
|
+
rescue
|
70
|
+
puts "failed to get deployconfig"
|
66
71
|
exit
|
67
72
|
end
|
68
73
|
end
|
@@ -207,13 +212,12 @@ def do_upload(uploader, template_result, opts)
|
|
207
212
|
|
208
213
|
upload_res = uploader.upload_template(template_result, opts)
|
209
214
|
|
210
|
-
if upload_res[:
|
211
|
-
|
212
|
-
if upload_res[:error] == 'validation_error'
|
215
|
+
if upload_res[:err]
|
216
|
+
if upload_res[:err] == 'validation_error'
|
213
217
|
vs = upload_res[:validation_status]
|
214
218
|
puts "validation error code: #{vs[:code]}"
|
215
219
|
puts "validation error message: #{vs[:message]}"
|
216
|
-
elsif upload_res[:
|
220
|
+
elsif upload_res[:err] == 'already_updated'
|
217
221
|
prev_opts = upload_res[:prev_opts]
|
218
222
|
last_update_timestamp = prev_opts['LastUpdateTimestamp']
|
219
223
|
template_git_revision = prev_opts['TemplateGitRevision']
|
@@ -230,7 +234,6 @@ def do_upload(uploader, template_result, opts)
|
|
230
234
|
end
|
231
235
|
|
232
236
|
def after_update(stack, timestamp)
|
233
|
-
stack_name = stack.name
|
234
237
|
#cmd = "watch -n 10 cfn-describe-stack-events #{stack_name}"
|
235
238
|
#cmd = "watch -n 10 bin/get_stack_events.rb #{stack_name}"
|
236
239
|
#puts cmd
|
@@ -245,8 +248,8 @@ def after_update(stack, timestamp)
|
|
245
248
|
puts event
|
246
249
|
end
|
247
250
|
end
|
248
|
-
get_sub_stacks( stack.name).each do |
|
249
|
-
get_stack_events(
|
251
|
+
get_sub_stacks( stack.name).each do |substack|
|
252
|
+
get_stack_events( substack).reverse.each do |event|
|
250
253
|
if stackEvents.add?(event)
|
251
254
|
puts "NESTED: #{event}"
|
252
255
|
end
|
@@ -257,6 +260,8 @@ def after_update(stack, timestamp)
|
|
257
260
|
rescue SystemExit, Interrupt
|
258
261
|
exit 0
|
259
262
|
end
|
263
|
+
else
|
264
|
+
puts "done updating"
|
260
265
|
end
|
261
266
|
|
262
267
|
# This is all working, tested code, just not sure it belongs here. --stsmith
|
@@ -387,7 +392,7 @@ def get_template_info()
|
|
387
392
|
instanceid = `/bin/netcat 169.254.169.254 80 -w 1 -q 0 </dev/null && /usr/bin/ec2metadata --instance-id`
|
388
393
|
instanceid.chomp!
|
389
394
|
|
390
|
-
|
395
|
+
return {
|
391
396
|
:gitrev => gitrev,
|
392
397
|
:gitstatus => gitstatus,
|
393
398
|
:source => source,
|