From 15b66e116b78f536d98fb9ef9f16d7ae6c902479 Mon Sep 17 00:00:00 2001
From: amartynov <amartynov@itcwin.com>
Date: Tue, 18 Aug 2015 20:01:17 +0300
Subject: [PATCH] servers info for stack

---
 devops-service/commands/stack.rb              |  3 ++-
 devops-service/db/mongo/connectors/stack.rb   |  2 +-
 devops-service/providers/ec2.rb               | 22 ++++++++-----------
 .../workers/stack_bootstrap_worker.rb         |  9 ++++----
 4 files changed, 17 insertions(+), 19 deletions(-)

diff --git a/devops-service/commands/stack.rb b/devops-service/commands/stack.rb
index d2acb1f..22d9ac8 100644
--- a/devops-service/commands/stack.rb
+++ b/devops-service/commands/stack.rb
@@ -20,9 +20,10 @@ module StackCommands
             out.flush
             break
           end
-          out << "Next try...\n"
+          out << "."
           out.flush
         end
+        out << "\n"
       rescue StandardError => e
         logger.error e.message
         out << "Error: #{e.message}\n"
diff --git a/devops-service/db/mongo/connectors/stack.rb b/devops-service/db/mongo/connectors/stack.rb
index 84d4529..958ba16 100644
--- a/devops-service/db/mongo/connectors/stack.rb
+++ b/devops-service/db/mongo/connectors/stack.rb
@@ -21,7 +21,7 @@ module Connectors
     def stack(name, options={})
       query = {'name' => name}.merge(options)
       bson = collection.find(query).to_a.first
-      raise RecordNotFound.new("'#{id}' not found") unless bson
+      raise RecordNotFound.new("'#{name}' not found") unless bson
       model_from_bson(bson)
     end
 
diff --git a/devops-service/providers/ec2.rb b/devops-service/providers/ec2.rb
index 369c740..cee4e82 100644
--- a/devops-service/providers/ec2.rb
+++ b/devops-service/providers/ec2.rb
@@ -255,21 +255,17 @@ module Provider
     end
 
     def stack_servers(stack)
-=begin
-      r = cloud_formation.list_stack_resources({'StackName' => stack.name}).body['StackResourceSummaries'] #stack_resources(stack)
-      pp r
-      s = r.map{|r| pp r; compute.servers.get(r['PhysicalResourceId'])}
-      pp s
-      s
-=end
       list = compute.describe_instances({'tag-key' => 'aws:cloudformation:stack-id', 'tag-value' => stack.id}).body["reservationSet"]
-      pp list
-      list.map{|l| pp l; convert_server(l["instancesSet"][0])}
-=begin
-      list.select{|l| l["instancesSet"][0]["instanceState"]["name"].to_s != "terminated"}.map do |server|
-
+      list.map do |l|
+        i = l["instancesSet"][0]
+        {
+          'name' => i["tagSet"]["Name"],
+          '_id' => i["instanceId"],
+          'key_name' => i["keyName"],
+          'private_ip' => i["privateIpAddress"],
+          'public_ip' => i["ipAddress"],
+        }
       end
-=end
     end
 
     def create_default_stack_name s
diff --git a/devops-service/workers/stack_bootstrap_worker.rb b/devops-service/workers/stack_bootstrap_worker.rb
index 3e1aae3..1d16e2d 100644
--- a/devops-service/workers/stack_bootstrap_worker.rb
+++ b/devops-service/workers/stack_bootstrap_worker.rb
@@ -55,10 +55,11 @@ class StackBootstrapWorker < Worker
         'project' => project.id,
         'deploy_env' => deploy_env.identifier,
         'remote_user' => mongo.image(deploy_env.image).remote_user,
-        'key' => extended_info.key_name || provider.ssh_key,
-        '_id' => extended_info.id,
-        'chef_node_name' => extended_info.name,
-        'private_ip' => extended_info.addresses.values.first.first['addr'],
+        'key' => extended_info["key_name"] || provider.ssh_key,
+        '_id' => extended_info["id"],
+        'chef_node_name' => extended_info["name"],
+        'private_ip' => extended_info["private_ip"],
+        'public_ip' => extended_info["public_ip"],
         'created_by' => stack.owner,
         'run_list' => stack.run_list || [],
         'stack' => stack.id