Merge branch 'bug_fix' into release

This commit is contained in:
Tim Lianov 2015-11-13 11:50:57 -05:00
commit 61a37d6e28
4 changed files with 6 additions and 5 deletions

View File

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

View File

@ -189,7 +189,9 @@ module Devops
end
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,
server_attrs: server.to_mongo_hash,

View File

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

View File

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