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

B #6026: Fix sunstone oneflow connection (#2385)

Browse Source
This commit is contained in:
Frederick Borges 2022-11-29 10:37:44 +01:00 committed by GitHub
parent 908ea212d8
commit 820970b182
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -555,8 +555,7 @@ helpers do
zone.info
url_one_zone = zone.retrieve_elements("TEMPLATE/ONEFLOW_ENDPOINT")
url_zone = zone.retrieve_elements("TEMPLATE/ENDPOINT")
session[:zone_flow_url] = (url_one_zone && url_one_zone[0]) || parse_flow_url(url_zone[0])
session[:zone_flow_url] = (url_one_zone && url_one_zone[0]) || $conf[:oneflow_server]
session[:zone_name] = zone.name
session[:zone_id] = zone.id
@ -588,14 +587,6 @@ helpers do
session.destroy
[204, ""]
end
def parse_flow_url(endpoint)
if endpoint
uri = URI(endpoint.to_s)
flow_uri = URI($conf[:oneflow_server])
return "#{uri.scheme}://#{uri.host}:#{flow_uri.port}"
end
end
end
before do
@ -657,7 +648,7 @@ before do
halt [500, OpenNebula::Error.new(msg).to_json]
end
session[:zone_flow_url] = z['TEMPLATE/ONEFLOW_ENDPOINT'] || parse_flow_url(z['TEMPLATE/ENDPOINT'])
session[:zone_flow_url] = z['TEMPLATE/ONEFLOW_ENDPOINT'] || $conf[:oneflow_server]
session[:active_zone_endpoint] = z['TEMPLATE/ENDPOINT']
session[:zone_name] = zone_name_header
session[:zone_id] = z.id