Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable Cockpit console for RHOS provider #2039

Merged
merged 2 commits into from
Sep 1, 2017
Merged

Enable Cockpit console for RHOS provider #2039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b94715b
Enable Cockpit console for RHOS provider
bmclaughlin Aug 29, 2017
8deca8e
Refactoring
bmclaughlin Aug 30, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/controllers/vm_remote.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 9 additions & 0 deletions app/helpers/application_helper/toolbar/cloud/instance_operations_button_group_mixin.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
),
]
),
])
Expand Down