From 2bb70dd318439ca71802d379af10306290a7979c Mon Sep 17 00:00:00 2001 From: Nicolas Bock Date: Tue, 24 Jan 2017 10:07:44 -0700 Subject: [PATCH] nova: Expose `use_serial` to UI Right now the `use_serial` switch is hidden in the raw view but it's useful enough to expose it in the UI. --- .../app/views/barclamp/nova/_edit_attributes.html.haml | 9 +++++++++ crowbar_framework/config/locales/nova/en.yml | 3 +++ 2 files changed, 12 insertions(+) diff --git a/crowbar_framework/app/views/barclamp/nova/_edit_attributes.html.haml b/crowbar_framework/app/views/barclamp/nova/_edit_attributes.html.haml index 1742a25639..4f1143cb18 100644 --- a/crowbar_framework/app/views/barclamp/nova/_edit_attributes.html.haml +++ b/crowbar_framework/app/views/barclamp/nova/_edit_attributes.html.haml @@ -97,6 +97,15 @@ = string_field %w(novnc ssl certfile) = string_field %w(novnc ssl keyfile) + %fieldset + %legend + = t(".serial_console_header") + + .alert.alert-warning + = t(".serial_console_hint") + + = boolean_field :use_serial + %fieldset %legend = t(".logging_header") diff --git a/crowbar_framework/config/locales/nova/en.yml b/crowbar_framework/config/locales/nova/en.yml index e54bb3f89a..ed1f034ac2 100644 --- a/crowbar_framework/config/locales/nova/en.yml +++ b/crowbar_framework/config/locales/nova/en.yml @@ -80,6 +80,9 @@ en: enabled: 'NoVNC Protocol' certfile: 'SSL Certificate File' keyfile: 'SSL (Private) Key File' + serial_console_header: 'Serial Console Settings' + serial_console_hint: 'Please note the following limitations: (1) NoVNC needs to be disabled when the serial console is enabled. (2) Access via serial console is unprotected. (3) Only one client can connect via serial console at a time.' + use_serial: 'Use serial console' logging_header: 'Logging' verbose: 'Verbose Logging' validation: