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

fix some errors

Browse Source
This commit is contained in:
Anton Chuchkalov 2015-08-05 17:30:42 +03:00
parent a929747715
commit 821f5f85d1
4 changed files with 16 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devops-service/app/api2/handlers/server.rb
View File

@ -30,7 +30,7 @@ module Devops
def servers def servers
fields, reserved = parser.servers fields, reserved = parser.servers
Devops::DB.connector.servers(nil, nil, nil, reserved, fields).map {|s| s.to_hash} Devops::Db.connector.servers(nil, nil, nil, reserved, fields).map {|s| s.to_hash}
end end
def chef_servers def chef_servers
@ -42,7 +42,7 @@ module Devops
end end
def server id def server id
get_server_by_key(id, parse.server) get_server_by_key(id, parser.server)
end end
def delete id def delete id

18
devops-service/commands/server.rb
View File

@ -169,15 +169,15 @@ module ServerCommands
s.remote_user = image.remote_user s.remote_user = image.remote_user
s.chef_node_name = info[:name] s.chef_node_name = info[:name]
s.key = info[:key] || provider.ssh_key s.key = info[:key] || provider.ssh_key
s.options = { # s.options = {
:image => image.id, # :image => image.id,
:flavor => info[:flavor], # :flavor => info[:flavor],
:name => info[:name], # :name => info[:name],
:groups => info[:groups], # :groups => info[:groups],
:run_list => info[:run_list].merge(s.run_list), # :run_list => info[:run_list].merge(s.run_list),
:bootstrap_template => image.bootstrap_template, # :bootstrap_template => image.bootstrap_template,
:subnets => info[:subnets] # :subnets => info[:subnets]
} # }
s.created_by = user s.created_by = user
servers.push s servers.push s
end end

11
devops-service/db/mongo/models/server.rb
View File

@ -43,7 +43,7 @@ module Devops
set_validators ::Validators::DeployEnv::RunList set_validators ::Validators::DeployEnv::RunList
def self.fields def self.fields
["chef_node_name", "project", "deploy_env", "provider", "remote_user", "private_ip", "public_ip", "created_at", "created_by", "key", "reserved_by"] ["chef_node_name", "project", "deploy_env", "provider", "remote_user", "private_ip", "public_ip", "created_at", "created_by", "key", "reserved_by", "run_list"]
end end
def initialize s={} def initialize s={}
@ -92,14 +92,7 @@ module Devops
"reserved_by" => self.reserved_by, "reserved_by" => self.reserved_by,
"stack" => stack, "stack" => stack,
"run_list" => self.run_list "run_list" => self.run_list
}.delete_if{|k,v| v.nil?} }.delete_if { |k,v| v.nil? }
end
def to_list_hash
{
"id" => self.id,
"chef_node_name" => self.chef_node_name
}
end end
def self.build_from_bson s def self.build_from_bson s

5
devops-service/workers/stack_bootstrap_worker.rb
View File

@ -51,15 +51,16 @@ class StackBootstrapWorker < Worker
'key' => extended_info.key_name 'key' => extended_info.key_name
} }
servers = extract_servers(provider, project, deploy_env, body, stack.owner, mongo) servers = extract_servers(provider, project, deploy_env, body, stack.owner)
servers.each do |server| servers.each do |server|
# TODO: improve IP assigning logic # TODO: improve IP assigning logic
server.private_ip = extended_info.addresses.values.first.first['addr'] server.private_ip = extended_info.addresses.values.first.first['addr']
server.id = extended_info.id
server.chef_node_name = extended_info.name
end end
stack_servers += servers stack_servers += servers
end end
stack_servers.each_with_index do |server, i| stack_servers.each_with_index do |server, i|
server.id = "stack-#{stack.id}-server-#{i+1}"
server.stack = stack.id server.stack = stack.id
mongo.server_insert server mongo.server_insert server
end end