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

test for tags

Browse Source
This commit is contained in:
amartynov 2015-09-21 13:34:08 +03:00
parent 1cccd2b5e7
commit 2ac1ce76c2
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,14 @@ module Provider
options = { options = {
"InstanceType" => flavor, "InstanceType" => flavor,
# "Placement.AvailabilityZone" => s.options[:availability_zone], # "Placement.AvailabilityZone" => s.options[:availability_zone],
"KeyName" => self.ssh_key "KeyName" => self.ssh_key,
"Tags" => {
"Name" => s.chef_node_name,
"cid:project" => s.project,
"cid:deployEnv" => s.deploy_env,
"cid:user" => s.created_by,
"cid:remoteUser" => s.remote_user
}
} }
vpcId = nil vpcId = nil
unless subnets.empty? unless subnets.empty?
@ -150,7 +157,7 @@ module Provider
end end
s.public_ip = details["ipAddress"] s.public_ip = details["ipAddress"]
s.private_ip = details["privateIpAddress"] s.private_ip = details["privateIpAddress"]
set_server_tags(s) # set_server_tags(s)
out << "\nDone\n\n" out << "\nDone\n\n"
out << s.info out << s.info
@ -159,11 +166,6 @@ module Provider
def set_server_tags s def set_server_tags s
tags = { tags = {
"Name" => s.chef_node_name,
"cid:project" => s.project,
"cid:deployEnv" => s.deploy_env,
"cid:user" => s.created_by,
"cid:remoteUser" => s.remote_user
} }
compute.create_tags(s.id, tags) compute.create_tags(s.id, tags)
end end
@ -226,12 +228,18 @@ module Provider
{ {
'TemplateBody' => stack.template_body, 'TemplateBody' => stack.template_body,
'Parameters' => stack.parameters || {}, 'Parameters' => stack.parameters || {},
'Capabilities' => ['CAPABILITY_IAM'] 'Capabilities' => ['CAPABILITY_IAM'],
'Tags' => {
"StackName" => stack.name,
"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) #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
@ -251,10 +259,6 @@ module Provider
def set_stack_tags stack, out="" def set_stack_tags stack, out=""
tags = { tags = {
"StackName" => stack.name,
"cid:project" => stack.project,
"cid:deployEnv" => stack.deploy_env,
"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']}