From 5354996243eacae87e1ff34c9823faea19cbdeba Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Mon, 3 Feb 2014 16:06:23 +0100 Subject: [PATCH] Get the correct zone_id from oned.conf file --- src/sunstone/sunstone-server.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/sunstone/sunstone-server.rb b/src/sunstone/sunstone-server.rb index ce50acb5be..30247b8dd7 100755 --- a/src/sunstone/sunstone-server.rb +++ b/src/sunstone/sunstone-server.rb @@ -208,7 +208,11 @@ helpers do env['rack.session.options'][:expire_after] = 30*60*60*24-1 end - zone = OpenNebula::Zone.new_with_id(0, client) + rc = OpenNebula::System.new(client).get_configuration + return [500, rc.message] if OpenNebula.is_error?(rc) + return [500, "Couldn't find out zone identifier"] if !rc['FEDERATION/ZONE_ID'] + + zone = OpenNebula::Zone.new_with_id(rc['FEDERATION/ZONE_ID'].to_i, client) zone.info session[:zone_name] = zone.name