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

Merge branch '#879' into features

Browse Source
This commit is contained in:
amartynov 2015-11-23 16:32:50 +03:00
commit 6f3862f822
2 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
devops-service/lib/executors/server_executor.rb
View File

@ -74,8 +74,18 @@ module Devops
@server @server
end end
def create_server_object options
Devops::Model::Server.new({
"project" => @project.id,
"deploy_env" => @deploy_env.identifier,
"created_by" => options["created_by"],
"provider" => @deploy_env.provider,
"provider_account" => @deploy_env.provider_account
})
end
def create_server options def create_server options
@server = Devops::Model::Server.new({"project" => @project.id, "deploy_env" => @deploy_env.identifier, "created_by" => options["created_by"], "provider" => @deploy_env.provider, "provider_account" => @deploy_env.provider_account}) @server = create_server_object(options)
@server.set_last_operation(Devops::Model::Server::OperationType::CREATION) @server.set_last_operation(Devops::Model::Server::OperationType::CREATION)
provider = @deploy_env.provider_instance provider = @deploy_env.provider_instance
mongo = ::Devops::Db.connector mongo = ::Devops::Db.connector

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

@ -153,7 +153,8 @@ module Provider
end end
s.public_ip = details["ipAddress"] s.public_ip = details["ipAddress"]
s.private_ip = details["privateIpAddress"] s.private_ip = details["privateIpAddress"]
tags = set_server_tags(s) tags = server_tags(s)
compute.create_tags(s.id, tags)
out << "\nServer tags: #{tags.inspect}\n" out << "\nServer tags: #{tags.inspect}\n"
out << "\nDone\n\n" out << "\nDone\n\n"
out << s.info out << s.info
@ -161,16 +162,14 @@ module Provider
true true
end end
def set_server_tags s def server_tags server
tags = { {
"Name" => s.chef_node_name, "Name" => server.chef_node_name,
"cid:project" => s.project, "cid:project" => server.project,
"cid:deployEnv" => s.deploy_env, "cid:deployEnv" => server.deploy_env,
"cid:user" => s.created_by, "cid:user" => server.created_by,
"cid:remoteUser" => s.remote_user "cid:remoteUser" => server.remote_user
} }
compute.create_tags(s.id, tags)
tags
end end
def delete_server s def delete_server s
@ -232,18 +231,11 @@ module Provider
'TemplateBody' => stack.template_body, 'TemplateBody' => stack.template_body,
'Parameters' => stack.parameters || {}, 'Parameters' => stack.parameters || {},
'Capabilities' => ['CAPABILITY_IAM'], 'Capabilities' => ['CAPABILITY_IAM'],
'Tags' => { 'Tags' => stack_tags(stack)
"StackName" => stack.name,
"StackTemplate" => stack.stack_template,
"cid:project" => stack.project,
"cid:deployEnv" => stack.deploy_env,
"cid:user" => stack.owner
}
} }
) )
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, out)
out.flush out.flush
rescue Excon::Errors::Conflict => e rescue Excon::Errors::Conflict => e
raise ProviderErrors::NameConflict raise ProviderErrors::NameConflict
@ -261,20 +253,13 @@ module Provider
end end
end end
def set_stack_tags stack, out="" def stack_tags stack
tags = { {
# "cid:remoteUser" => s.remote_user "StackTemplate" => stack.stack_template,
"cid:project" => stack.project,
"cid:deployEnv" => stack.deploy_env,
"cid:user" => stack.owner
} }
#ids = stack_resources(stack).map {|resource| resource['PhysicalResourceId']}
#ids << stack.id
#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