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

Merge branch 'bug_fix' into qa

Browse Source
This commit is contained in:
Tim Lianov 2015-11-13 11:50:22 -05:00
commit 27437914a1
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devops-client/lib/devops-client/i18n.rb
View File

@ -29,6 +29,7 @@ module I18n
rescue rescue
return "Translation missing" return "Translation missing"
end end
buf = buf.dup
options.each do |k,v| options.each do |k,v|
buf.gsub!("%{#{k.to_s}}", v.to_s) buf.gsub!("%{#{k.to_s}}", v.to_s)
end end

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

@ -189,7 +189,9 @@ module Devops
end end
def bootstrap_server def bootstrap_server
server, rl, bootstrap_template = prepare_bootstrap_server attrs = prepare_bootstrap_server
server = attrs[:server]
bootstrap_template = attrs[:bootstrap_template]
jid = Worker.start_async(BootstrapWorker, jid = Worker.start_async(BootstrapWorker,
server_attrs: server.to_mongo_hash, server_attrs: server.to_mongo_hash,

4
devops-service/app/api2/parsers/project.rb
View File

@ -23,11 +23,11 @@ module Devops
end end
def project_servers def project_servers
@params[:deploy_env] @params["deploy_env"]
end end
def project_stacks def project_stacks
@params[:deploy_env] @params["deploy_env"]
end end
def create_project def create_project

2
devops-service/db/mongo/models/deploy_env/cloud_deploy_env.rb
View File

@ -29,8 +29,6 @@ module Devops
#TODO: account validator #TODO: account validator
set_validators ::Validators::DeployEnv::Flavor, set_validators ::Validators::DeployEnv::Flavor,
::Validators::DeployEnv::Image, ::Validators::DeployEnv::Image,
::Validators::DeployEnv::SubnetNotEmpty,
::Validators::DeployEnv::SubnetBelongsToProvider,
::Validators::DeployEnv::Groups, ::Validators::DeployEnv::Groups,
::Validators::DeployEnv::StackTemplate ::Validators::DeployEnv::StackTemplate
# set_validators ::Validators::DeployEnv::CloudParameters # set_validators ::Validators::DeployEnv::CloudParameters