diff --git a/devops-client/lib/devops-client/i18n.rb b/devops-client/lib/devops-client/i18n.rb index 95576ba..17c3e2d 100644 --- a/devops-client/lib/devops-client/i18n.rb +++ b/devops-client/lib/devops-client/i18n.rb @@ -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 diff --git a/devops-service/app/api2/handlers/server.rb b/devops-service/app/api2/handlers/server.rb index c7bcedc..448ec1e 100644 --- a/devops-service/app/api2/handlers/server.rb +++ b/devops-service/app/api2/handlers/server.rb @@ -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, diff --git a/devops-service/app/api2/parsers/project.rb b/devops-service/app/api2/parsers/project.rb index dc2a8e9..53b3cec 100644 --- a/devops-service/app/api2/parsers/project.rb +++ b/devops-service/app/api2/parsers/project.rb @@ -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 diff --git a/devops-service/db/mongo/models/deploy_env/cloud_deploy_env.rb b/devops-service/db/mongo/models/deploy_env/cloud_deploy_env.rb index 603da0c..30adbf2 100644 --- a/devops-service/db/mongo/models/deploy_env/cloud_deploy_env.rb +++ b/devops-service/db/mongo/models/deploy_env/cloud_deploy_env.rb @@ -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