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

#720: done

Browse Source
This commit is contained in:
amartynov 2015-09-22 15:23:13 +03:00
parent fd21a58673
commit 98d243aee1
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
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?
@ -167,6 +160,11 @@ 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 tags
@ -233,6 +231,7 @@ module Provider
'Capabilities' => ['CAPABILITY_IAM'], 'Capabilities' => ['CAPABILITY_IAM'],
'Tags' => { 'Tags' => {
"StackName" => stack.name, "StackName" => stack.name,
"StackTemplate" => stack.stack_template,
"cid:project" => stack.project, "cid:project" => stack.project,
"cid:deployEnv" => stack.deploy_env, "cid:deployEnv" => stack.deploy_env,
"cid:user" => stack.owner "cid:user" => stack.owner