From e439b1020992d60a37c0927f77f90a64149d8c77 Mon Sep 17 00:00:00 2001 From: Frederick Borges Date: Mon, 6 Sep 2021 13:59:27 +0200 Subject: [PATCH] B #5452: Fix Oneflow on Sunstone to use oneflow_server variable (#1437) (cherry picked from commit de1eecdbc225216e6348a9dc45f22477a2f157c3) --- src/sunstone/routes/oneflow.rb | 2 +- src/sunstone/sunstone-server.rb | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/sunstone/routes/oneflow.rb b/src/sunstone/routes/oneflow.rb index b6ac95965c..5a100e1c3b 100644 --- a/src/sunstone/routes/oneflow.rb +++ b/src/sunstone/routes/oneflow.rb @@ -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(':')) diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb index c651641215..d5d31a1579 100755 --- a/src/sunstone/sunstone-server.rb +++ b/src/sunstone/sunstone-server.rb @@ -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