diff --git a/Gemfile b/Gemfile index 37ff1c55bd7..dfb2afc83fe 100644 --- a/Gemfile +++ b/Gemfile @@ -152,10 +152,6 @@ group :google, :openshift, :manageiq_default do gem "sshkey", "~>1.8.0", :require => false end -group :automate, :cockpit, :manageiq_default do - gem "open4", "~>1.3.0", :require => false -end - ### end of provider bundler groups group :automate, :seed, :manageiq_default do diff --git a/app/models/miq_cockpit_ws_worker/runner.rb b/app/models/miq_cockpit_ws_worker/runner.rb index 62d35ff7cd9..52d73b2e28c 100644 --- a/app/models/miq_cockpit_ws_worker/runner.rb +++ b/app/models/miq_cockpit_ws_worker/runner.rb @@ -143,16 +143,16 @@ def cockpit_ws_run cockpit_ws = MiqCockpit::WS.new(opts) cockpit_ws.save_config - require 'open4' + require "open3" env = { "XDG_CONFIG_DIRS" => cockpit_ws.config_dir, "DRB_URI" => @drb_uri } - pid, stdin, stdout, stderr = Open4.popen4(env, *cockpit_ws.command(BINDING_ADDRESS)) + stdin, stdout, stderr, wait_thr = Open3.popen3(env, *cockpit_ws.command(BINDING_ADDRESS)) stdin.close _log.info("#{log_prefix} cockpit-ws process started - pid=#{pid}") - return pid, stdout, stderr + return wait_thr.pid, stdout, stderr end def check_drb_service