diff --git a/VERSION b/VERSION index b1b25a5..5859406 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.2.2 +2.2.3 diff --git a/resources/scripts/rb_setup_wizard.rb b/resources/scripts/rb_setup_wizard.rb index 6017529..5c91288 100755 --- a/resources/scripts/rb_setup_wizard.rb +++ b/resources/scripts/rb_setup_wizard.rb @@ -116,7 +116,7 @@ def cancel_wizard() dhcp_interfaces = general_conf["network"]["interfaces"].select { |i| i["mode"] == "dhcp" } if general_conf["network"]["interfaces"].size > 1 - if static_interface.size == 1 && dhcp_interfaces.size >= 1 + if static_interface && static_interface.size == 1 && dhcp_interfaces.size >= 1 general_conf["network"]["management_interface"] = static_interface["device"] else interface_options = general_conf["network"]["interfaces"].map { |i| [i["device"]] } diff --git a/resources/scripts/rb_sync_minio_cluster.rb b/resources/scripts/rb_sync_minio_cluster.rb index 141acf6..08c2b7e 100644 --- a/resources/scripts/rb_sync_minio_cluster.rb +++ b/resources/scripts/rb_sync_minio_cluster.rb @@ -80,6 +80,8 @@ def self.cluster_leader # Module for making HTTP requests module HTTP + HTTP_OPEN_TIMEOUT = 900 + HTTP_READ_TIMEOUT = 900 # Sends an HTTP request. # # @param url [String] The URL to request. @@ -91,6 +93,8 @@ module HTTP def self.request(url, method, body = nil, cookie = nil, log: false) uri = URI.parse(url) http = Net::HTTP.new(uri.host, uri.port) + http.read_timeout = HTTP_READ_TIMEOUT + http.open_timeout = HTTP_OPEN_TIMEOUT request_class = { 'POST' => Net::HTTP::Post, 'DELETE' => Net::HTTP::Delete }[method.upcase] || Net::HTTP::Get request = request_class.new(uri.request_uri)