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

Merge branch 'stack_servers' into features

Browse Source
This commit is contained in:
amartynov 2015-12-03 16:45:13 +03:00
commit 82b766e6ba
3 changed files with 11 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
devops-client/lib/devops-client/handler/deploy.rb
View File

@ -14,6 +14,8 @@ class Deploy < Handler
if ARGV.size > 1 if ARGV.size > 1
self.options = @options_parser.deploy_options self.options = @options_parser.deploy_options
deploy_handler @options_parser.args deploy_handler @options_parser.args
else
@options_parser.invalid_command
end end
end end

30
devops-service/db/mongo/models/project.rb
View File

@ -39,7 +39,7 @@ module Devops
def initialize p={} def initialize p={}
self.id = p["name"] self.id = p["name"]
#raise InvalidRecord.new "No deploy envirenments for project #{self.id}" if p["deploy_envs"].nil? or p["deploy_envs"].empty? #raise InvalidRecord.new "No deploy environments for project #{self.id}" if p["deploy_envs"].nil? or p["deploy_envs"].empty?
self.type = p["type"] || Devops::GenericType.name self.type = p["type"] || Devops::GenericType.name
self.description = p["description"] self.description = p["description"]
self.archived = p["archived"] || false self.archived = p["archived"] || false
@ -73,34 +73,20 @@ module Devops
def add_authorized_user user, env=nil def add_authorized_user user, env=nil
return if user.nil? return if user.nil?
new_users = ( user.is_a?(Array) ? user : [ user ] ) new_users = ( user.is_a?(Array) ? user : [ user ] )
if env.nil? environments = env.nil? ? self.deploy_envs : [ self.deploy_env(env) ]
self.deploy_envs.each do |e| environments .each do |e|
return unless e.users.is_a?(Array)
e.add_users new_users e.add_users new_users
Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, "users", e.users) Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, {users: e.users})
end
else
e = self.deploy_env(env)
return unless e.users.is_a?(Array)
e.add_users new_users
Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, "users", e.users)
end end
end end
def remove_authorized_user user, env=nil def remove_authorized_user user, env=nil
return if user.nil? return if user.nil?
users = ( user.is_a?(Array) ? user : [ user ] ) users = ( user.is_a?(Array) ? user : [ user ] )
if env.nil? environments = env.nil? ? self.deploy_envs : [ self.deploy_env(env) ]
self.deploy_envs.each do |e| environments.each do |e|
return unless e.users.is_a?(Array)
e.users = e.users - users e.users = e.users - users
Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, "users", e.users) Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, {users: e.users})
end
else
e = self.deploy_env(env)
return unless e.users.is_a?(Array)
e.users = e.users - users
Devops::Db.connector.set_project_deploy_env_field(self.id, e.identifier, "users", e.users)
end end
end end
@ -211,7 +197,7 @@ module Devops
end end
def self.create_roles_response roles def self.create_roles_response roles
if roles.is_a?(String) if !roles || roles.is_a?(String)
roles roles
else else
info = "" info = ""

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

@ -184,6 +184,7 @@ class StackBootstrapWorker < Worker
stack_servers_with_priority = {} stack_servers_with_priority = {}
stack_servers_info.each do |priority, info_array| stack_servers_info.each do |priority, info_array|
stack_servers_with_priority[priority] = info_array.map do |extended_info| stack_servers_with_priority[priority] = info_array.map do |extended_info|
@out.puts "Instance '#{extended_info["id"]}' has been launched with stack."
server_attrs = { server_attrs = {
'provider' => provider.name, 'provider' => provider.name,
'project' => project.id, 'project' => project.id,