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

server without Tags, some tests for stack

Browse Source
This commit is contained in:
amartynov 2015-09-21 17:34:20 +03:00
parent 2ac1ce76c2
commit 324992a13e
2 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devops-service/db/mongo/models/stack/stack_ec2.rb
View File

@ -8,7 +8,8 @@ module Devops
end end
def stack_status def stack_status
details['StackStatus'] if details puts self.details.inspect
self.details['StackStatus'] if self.details
end end
def bson_safe_details def bson_safe_details

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

@ -103,14 +103,7 @@ 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?
@ -157,7 +150,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"]
# set_server_tags(s) tags = set_server_tags(s)
out << "Server tags: #{tags.inspect}\n"
out << "\nDone\n\n" out << "\nDone\n\n"
out << s.info out << s.info
@ -166,8 +160,14 @@ 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)
tags
end end
def delete_server s def delete_server s
@ -283,7 +283,10 @@ module Provider
end end
def stack_details(stack) def stack_details(stack)
cloud_formation.describe_stacks({'StackName' => stack.name}).body['Stacks'][0] #cloud_formation.describe_stacks({'StackName' => stack.name}).body['Stacks'][0]
b = cloud_formation.describe_stacks({'StackName' => stack.name}).body
pp b
b['Stacks'][0]
end end
def stack_resources(stack) def stack_resources(stack)