From 2ac1ce76c23e75d04629a358164bafdf09e2cdcd Mon Sep 17 00:00:00 2001
From: amartynov <amartynov@itcwin.com>
Date: Mon, 21 Sep 2015 13:34:08 +0300
Subject: [PATCH] test for tags

---
 devops-service/providers/ec2.rb | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/devops-service/providers/ec2.rb b/devops-service/providers/ec2.rb
index 8060dcf..5da703d 100644
--- a/devops-service/providers/ec2.rb
+++ b/devops-service/providers/ec2.rb
@@ -103,7 +103,14 @@ module Provider
       options = {
         "InstanceType" => flavor,
 #        "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
       unless subnets.empty?
@@ -150,7 +157,7 @@ module Provider
       end
       s.public_ip = details["ipAddress"]
       s.private_ip = details["privateIpAddress"]
-      set_server_tags(s)
+#      set_server_tags(s)
       out << "\nDone\n\n"
       out << s.info
 
@@ -159,11 +166,6 @@ module Provider
 
     def set_server_tags s
       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)
     end
@@ -226,12 +228,18 @@ module Provider
           {
             'TemplateBody' => stack.template_body,
             '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']
         out << "Stack id: #{stack.id}\n"
-        set_stack_tags(stack, out)
+        #set_stack_tags(stack, out)
         out.flush
       rescue Excon::Errors::Conflict => e
         raise ProviderErrors::NameConflict
@@ -250,11 +258,7 @@ module Provider
     end
 
     def set_stack_tags stack, out=""
-       tags = {
-        "StackName" => stack.name,
-        "cid:project" => stack.project,
-        "cid:deployEnv" => stack.deploy_env,
-        "cid:user" => stack.owner
+      tags = {
 #        "cid:remoteUser" => s.remote_user
       }
       #ids = stack_resources(stack).map {|resource| resource['PhysicalResourceId']}