From 4ef299c4cb413331c405046bf05bad93789475ac Mon Sep 17 00:00:00 2001
From: amartynov <amartynov@itcwin.com>
Date: Wed, 11 Jun 2014 12:13:02 +0400
Subject: [PATCH] default chef_node_name for provider

---
 devops-service/commands/server.rb     | 2 +-
 devops-service/providers/ec2.rb       | 4 ++++
 devops-service/providers/openstack.rb | 5 ++++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/devops-service/commands/server.rb b/devops-service/commands/server.rb
index ae39936..615e8e1 100644
--- a/devops-service/commands/server.rb
+++ b/devops-service/commands/server.rb
@@ -60,7 +60,7 @@ module ServerCommands
       s.project = project_name
       s.deploy_env = env_name
       s.remote_user = image.remote_user
-      s.chef_node_name = info[:name] || "#{provider.ssh_key}-#{project_name}-#{env_name}-#{Time.now.to_i}"
+      s.chef_node_name = info[:name] || provider.create_default_chef_node_name(s)
       s.key = info[:key] || provider.ssh_key
       s.options = {
         :image => image.id,
diff --git a/devops-service/providers/ec2.rb b/devops-service/providers/ec2.rb
index 89b0518..db07409 100644
--- a/devops-service/providers/ec2.rb
+++ b/devops-service/providers/ec2.rb
@@ -160,6 +160,10 @@ module Version2_0
         true
       end
 
+      def create_default_chef_node_name s
+        "#{self.ssh_key}-#{s.project}-#{s.deploy_env}-#{Time.now.to_i}"
+      end
+
       def delete_server id
         r = self.compute.terminate_instances(id)
         i = r.body["instancesSet"][0]
diff --git a/devops-service/providers/openstack.rb b/devops-service/providers/openstack.rb
index fabdc9b..124cd9e 100644
--- a/devops-service/providers/openstack.rb
+++ b/devops-service/providers/openstack.rb
@@ -87,7 +87,6 @@ module Version2_0
 
       def servers
         list = self.compute.list_servers_detail.body["servers"]
-puts list[0].inspect
         list.map do |s|
           o = {"state" => s["status"], "name" => s["name"], "image" => s["image"]["id"], "flavor" => s["flavor"]["name"], "keypair" => s["key_name"], "instance_id" => s["id"]}
           s["addresses"].each_value do |a|
@@ -165,6 +164,10 @@ puts list[0].inspect
         true
       end
 
+      def create_default_chef_node_name s
+        "#{self.ssh_key}-#{s.project}-#{s.deploy_env}-#{Time.now.to_i}"
+      end
+
       def delete_server id
         r = self.compute.delete_server(id)
         return r.status == 204 ? "Server with id '#{id}' terminated" : r.body