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

Merge branch 'devops_3' of git.stu.neva.ru:cloudtechlab/devops-service into devops_3

Browse Source
This commit is contained in:
Anton Martynov 2015-10-01 11:11:33 +03:00
commit 73a68455bd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devops-service/commands/knife_commands.rb
View File

@ -48,7 +48,8 @@ class KnifeCommands
"json_class": "Chef::Role", "json_class": "Chef::Role",
"default_attributes": { "default_attributes": {
"project": "#{project}", "project": "#{project}",
"env": "#{env}" "env": "#{env}",
"deploy_env": "#{env}"
}, },
"override_attributes": {}, "override_attributes": {},
"chef_type": "role", "chef_type": "role",

2
devops-service/lib/executors/server_executor.rb
View File

@ -345,6 +345,8 @@ module Devops
end end
@out.flush @out.flush
cmd << " -j http://#{DevopsConfig.config[:address]}:#{DevopsConfig.config[:port]}/#{DevopsConfig.config[:url_prefix]}/v2.0/deploy/data/#{file}" cmd << " -j http://#{DevopsConfig.config[:address]}:#{DevopsConfig.config[:port]}/#{DevopsConfig.config[:url_prefix]}/v2.0/deploy/data/#{file}"
else
cmd << " -r #{deploy_info["run_list"].join(",")}"
end end
ip = if @server.public_ip.nil? ip = if @server.public_ip.nil?
@server.private_ip @server.private_ip