Merge pull request #2039 from bmclaughlin/enable-cockpit-for-rhos

Enable Cockpit console for RHOS provider
ManageIQ · Sep 1, 2017 · 9077990 · 9077990
2 parents 1282b59 + 8deca8e
commit 9077990
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/app/controllers/vm_remote.rb b/app/controllers/vm_remote.rb
@@ -12,7 +12,7 @@ def launch_cockpit
     vm = identify_record(params[:id], VmOrTemplate)
 
     if vm.supports_launch_cockpit?
-      javascript_open_window(vm.cockpit_url)
+      javascript_open_window(vm.cockpit_url.to_s)
     else
       javascript_flash(:text => vm.unsupported_reason(:launch_cockpit), :severity => :error, :spinner_off => true)
     end

diff --git a/app/helpers/application_helper/toolbar/cloud/instance_operations_button_group_mixin.rb b/app/helpers/application_helper/toolbar/cloud/instance_operations_button_group_mixin.rb
@@ -114,6 +114,15 @@ def self.included(included_class)
             N_('VM Console'),
             :url   => "html5_console",
             :klass => ApplicationHelper::Button::VmVncConsole),
+          included_class.button(
+            :cockpit_console,
+            'pficon pficon-screen fa-lg',
+            N_('Open a new browser window with Cockpit for this VM.  This requires that Cockpit is pre-configured on the VM.'),
+            N_('Web Console'),
+            # :image   => "cockpit",
+            :url   => "launch_cockpit",
+            :klass => ApplicationHelper::Button::CockpitConsole
+          ),
         ]
       ),
     ])