tim/fluke
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

set tags if no errors

Browse Source
This commit is contained in:
Anton Martynov 2015-09-16 17:13:42 +03:00
parent 735edc1eab
commit 98f8eb7c16
2 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devops-service/providers/base_provider.rb
View File

@ -40,7 +40,7 @@ module Provider
def set_server_tags server def set_server_tags server
end end
def set_stack_tags stack def set_stack_tags stack, out=""
end end
end end

15
devops-service/providers/ec2.rb
View File

@ -231,7 +231,7 @@ module Provider
) )
stack.id = response.body['StackId'] stack.id = response.body['StackId']
out << "Stack id: #{stack.id}\n" out << "Stack id: #{stack.id}\n"
set_stack_tags(stack) set_stack_tags(stack, out)
out.flush out.flush
rescue Excon::Errors::Conflict => e rescue Excon::Errors::Conflict => e
raise ProviderErrors::NameConflict raise ProviderErrors::NameConflict
@ -249,7 +249,7 @@ module Provider
end end
end end
def set_stack_tags stack def set_stack_tags stack, out=""
tags = { tags = {
"StackName" => stack.name, "StackName" => stack.name,
"cid:project" => stack.project, "cid:project" => stack.project,
@ -257,9 +257,16 @@ module Provider
"cid:user" => stack.owner "cid:user" => stack.owner
# "cid:remoteUser" => s.remote_user # "cid:remoteUser" => s.remote_user
} }
ids = stack_resources(stack).map {|resource| resource['PhysicalResourceId']} #ids = stack_resources(stack).map {|resource| resource['PhysicalResourceId']}
#ids << stack.id #ids << stack.id
compute.create_tags(ids, tags) #compute.create_tags(ids, tags)
stack_resources(stack).each do |resource|
begin
compute.create_tags(resource['PhysicalResourceId'], tags)
rescue Fog::Compute::AWS::Error => e
out << "Error: " + e.message
end
end
end end
def validate_stack_template template def validate_stack_template template