Merge branch 'devops_3' of git.stu.neva.ru:cloudtechlab/devops-service into devops_3
This commit is contained in:
commit
73a68455bd
@ -48,7 +48,8 @@ class KnifeCommands
|
||||
"json_class": "Chef::Role",
|
||||
"default_attributes": {
|
||||
"project": "#{project}",
|
||||
"env": "#{env}"
|
||||
"env": "#{env}",
|
||||
"deploy_env": "#{env}"
|
||||
},
|
||||
"override_attributes": {},
|
||||
"chef_type": "role",
|
||||
|
||||
@ -345,6 +345,8 @@ module Devops
|
||||
end
|
||||
@out.flush
|
||||
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
|
||||
ip = if @server.public_ip.nil?
|
||||
@server.private_ip
|
||||
|
||||
Loading…
Reference in New Issue
Block a user