shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-16 22:50:10 +03:00
Code Releases Wiki Activity

B #5452: Fix Oneflow on Sunstone to use oneflow_server variable (#1437)

Browse Source 
(cherry picked from commit de1eecdbc225216e6348a9dc45f22477a2f157c3)
This commit is contained in:
Frederick Borges 2021-09-06 13:59:27 +02:00 committed by Tino Vazquez
parent e5331ccb1d
commit e439b10209
No known key found for this signature in database
GPG Key ID: 14201E424D02047E
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/sunstone/routes/oneflow.rb
View File

@ -25,7 +25,7 @@ helpers do
split_array = flow_client.one_auth.split(':')
Service::Client.new(
:url => session[:zone_flow_url] || $conf[:oneflow_server],
:url => session[:zone_flow_url],
:user_agent => "Sunstone",
:username => split_array.shift,
:password => split_array.join(':'))

3
src/sunstone/sunstone-server.rb
View File

@ -577,7 +577,8 @@ helpers do
def parse_flow_url(endpoint)
if endpoint
uri = URI(endpoint.to_s)
return "#{uri.scheme}://#{uri.host}:2474"
flow_uri = URI($conf[:oneflow_server])
return "#{uri.scheme}://#{uri.host}:#{flow_uri.port}"
end
end
end