From 3c3f0d1015fe6616c640113192d02b18ca7ffbb6 Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Fri, 23 Oct 2015 22:06:57 +0300 Subject: [PATCH 1/4] #740: remove validation of subnet presence --- devops-service/db/mongo/models/deploy_env/cloud_deploy_env.rb | 2 -- 1 file changed, 2 deletions(-) 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 f608421..c187b7e 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 @@ -28,8 +28,6 @@ module Devops 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 From 2bbe07d8c0015d8b8ca74e690a1a8802a3d4a3d0 Mon Sep 17 00:00:00 2001 From: amartynov Date: Tue, 10 Nov 2015 17:06:25 +0300 Subject: [PATCH 2/4] fixed deploy_env in project servers --- devops-service/app/api2/parsers/project.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 From d3fb682b4b5b4a42e4740982b351f11254a19e3f Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Thu, 12 Nov 2015 20:18:55 +0300 Subject: [PATCH 3/4] fix i18n interpolation bug --- devops-client/lib/devops-client/i18n.rb | 1 + 1 file changed, 1 insertion(+) 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 From cf8a3404474cefdb9298231bbd427217478ef04f Mon Sep 17 00:00:00 2001 From: Anton Chuchkalov Date: Fri, 13 Nov 2015 19:12:28 +0300 Subject: [PATCH 4/4] fix bootstraping error --- devops-service/app/api2/handlers/server.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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,