From b104792f2d3fc984cd56c64a832bfb2bec28caa0 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 2 Sep 2018 01:26:01 +0200 Subject: [PATCH] openstack: Rename SSL options to TLS SSL is really ancient term, we should use the more common and modern TLS acronym instead. --- .../barclamp/aodh/_edit_attributes.html.haml | 2 +- .../barbican/_edit_attributes.html.haml | 2 +- .../ceilometer/_edit_attributes.html.haml | 2 +- .../database/_edit_attributes.html.haml | 2 +- .../glance/_edit_attributes.html.haml | 2 +- .../barclamp/heat/_edit_attributes.html.haml | 2 +- .../horizon/_edit_attributes.html.haml | 2 +- .../ironic/_edit_attributes.html.haml | 2 +- .../keystone/_edit_attributes.html.haml | 2 +- .../manila/_edit_attributes.html.haml | 2 +- .../neutron/_edit_attributes.html.haml | 2 +- .../barclamp/nova/_edit_attributes.html.haml | 2 +- .../rabbitmq/_edit_attributes.html.haml | 2 +- crowbar_framework/config/locales/aodh/en.yml | 12 ++++---- .../config/locales/barbican/en.yml | 12 ++++---- .../config/locales/ceilometer/en.yml | 12 ++++---- .../config/locales/cinder/en.yml | 14 ++++----- .../config/locales/database/en.yml | 10 +++---- .../config/locales/glance/en.yml | 14 ++++----- crowbar_framework/config/locales/heat/en.yml | 12 ++++---- .../config/locales/horizon/en.yml | 6 ++-- .../config/locales/ironic/en.yml | 2 +- .../config/locales/keystone/en.yml | 10 +++---- .../config/locales/manila/en.yml | 12 ++++---- .../config/locales/neutron/en.yml | 12 ++++---- crowbar_framework/config/locales/nova/en.yml | 30 +++++++++---------- .../config/locales/rabbitmq/en.yml | 12 ++++---- crowbar_framework/config/locales/swift/en.yml | 8 ++--- 28 files changed, 102 insertions(+), 102 deletions(-) diff --git a/crowbar_framework/app/views/barclamp/aodh/_edit_attributes.html.haml b/crowbar_framework/app/views/barclamp/aodh/_edit_attributes.html.haml index 5c38d28cdd..43410b5eb5 100644 --- a/crowbar_framework/app/views/barclamp/aodh/_edit_attributes.html.haml +++ b/crowbar_framework/app/views/barclamp/aodh/_edit_attributes.html.haml @@ -13,7 +13,7 @@ %fieldset %legend - = t(".ssl_header") + = t(".tls_header") = select_field %w(api protocol), :collection => :api_protocols_for_aodh, diff --git a/crowbar_framework/app/views/barclamp/barbican/_edit_attributes.html.haml b/crowbar_framework/app/views/barclamp/barbican/_edit_attributes.html.haml index 17e183f868..774ad283dd 100644 --- a/crowbar_framework/app/views/barclamp/barbican/_edit_attributes.html.haml +++ b/crowbar_framework/app/views/barclamp/barbican/_edit_attributes.html.haml @@ -6,7 +6,7 @@ %fieldset %legend - = t(".ssl_header") + = t(".tls_header") = select_field %w(api protocol), :collection => :api_protocols_for_barbican, diff --git a/crowbar_framework/app/views/barclamp/ceilometer/_edit_attributes.html.haml b/crowbar_framework/app/views/barclamp/ceilometer/_edit_attributes.html.haml index fca4a601cf..c4078c94fe 100644 --- a/crowbar_framework/app/views/barclamp/ceilometer/_edit_attributes.html.haml +++ b/crowbar_framework/app/views/barclamp/ceilometer/_edit_attributes.html.haml @@ -22,7 +22,7 @@ %fieldset %legend - = t(".ssl_header") + = t(".tls_header") = select_field %w(api protocol), :collection => :api_protocols_for_ceilometer, diff --git a/crowbar_framework/app/views/barclamp/database/_edit_attributes.html.haml b/crowbar_framework/app/views/barclamp/database/_edit_attributes.html.haml index 8719f58b7d..656f597d79 100644 --- a/crowbar_framework/app/views/barclamp/database/_edit_attributes.html.haml +++ b/crowbar_framework/app/views/barclamp/database/_edit_attributes.html.haml @@ -16,7 +16,7 @@ %fieldset{ "style" => "display:none" } %legend - = t(".mysql.ssl_header") + = t(".mysql.tls_header") = boolean_field %w(mysql ssl enabled), "data-sslprefix" => "ssl" diff --git a/crowbar_framework/app/views/barclamp/glance/_edit_attributes.html.haml b/crowbar_framework/app/views/barclamp/glance/_edit_attributes.html.haml index f61f7d9e44..4a37f13689 100644 --- a/crowbar_framework/app/views/barclamp/glance/_edit_attributes.html.haml +++ b/crowbar_framework/app/views/barclamp/glance/_edit_attributes.html.haml @@ -46,7 +46,7 @@ %fieldset %legend - = t(".ssl_header") + = t(".tls_header") = select_field %w(api protocol), :collection => :api_protocols_for_glance, "data-sslprefix" => "ssl", "data-sslcert" => "/etc/glance/ssl/certs/signing_cert.pem", "data-sslkey" => "/etc/glance/ssl/private/signing_key.pem" diff --git a/crowbar_framework/app/views/barclamp/heat/_edit_attributes.html.haml b/crowbar_framework/app/views/barclamp/heat/_edit_attributes.html.haml index 40939b9250..ac935dcc7c 100644 --- a/crowbar_framework/app/views/barclamp/heat/_edit_attributes.html.haml +++ b/crowbar_framework/app/views/barclamp/heat/_edit_attributes.html.haml @@ -9,7 +9,7 @@ %fieldset %legend - = t(".ssl_header") + = t(".tls_header") = select_field %w(api protocol), :collection => :api_protocols_for_heat, diff --git a/crowbar_framework/app/views/barclamp/horizon/_edit_attributes.html.haml b/crowbar_framework/app/views/barclamp/horizon/_edit_attributes.html.haml index ea0c0ce33c..50daa2de54 100644 --- a/crowbar_framework/app/views/barclamp/horizon/_edit_attributes.html.haml +++ b/crowbar_framework/app/views/barclamp/horizon/_edit_attributes.html.haml @@ -17,7 +17,7 @@ %fieldset %legend - = t(".ssl_header") + = t(".tls_header") = boolean_field %w(apache ssl), :collection => :ssl_protocols_for_horizon, diff --git a/crowbar_framework/app/views/barclamp/ironic/_edit_attributes.html.haml b/crowbar_framework/app/views/barclamp/ironic/_edit_attributes.html.haml index 7ac2c4ed0f..e138fd912f 100644 --- a/crowbar_framework/app/views/barclamp/ironic/_edit_attributes.html.haml +++ b/crowbar_framework/app/views/barclamp/ironic/_edit_attributes.html.haml @@ -12,6 +12,6 @@ %fieldset %legend - = t(".ssl_header") + = t(".tls_header") = select_field %w(api protocol), collection: :api_protocols_for_ironic diff --git a/crowbar_framework/app/views/barclamp/keystone/_edit_attributes.html.haml b/crowbar_framework/app/views/barclamp/keystone/_edit_attributes.html.haml index d11176d2b8..ddb165251c 100644 --- a/crowbar_framework/app/views/barclamp/keystone/_edit_attributes.html.haml +++ b/crowbar_framework/app/views/barclamp/keystone/_edit_attributes.html.haml @@ -26,7 +26,7 @@ %fieldset %legend - = t(".ssl_header") + = t(".tls_header") = select_field %w(api protocol), :collection => :api_protocols_for_keystone, diff --git a/crowbar_framework/app/views/barclamp/manila/_edit_attributes.html.haml b/crowbar_framework/app/views/barclamp/manila/_edit_attributes.html.haml index 637301d315..1a08f5ed0e 100644 --- a/crowbar_framework/app/views/barclamp/manila/_edit_attributes.html.haml +++ b/crowbar_framework/app/views/barclamp/manila/_edit_attributes.html.haml @@ -114,7 +114,7 @@ %fieldset %legend - = t('.ssl_header') + = t('.tls_header') = select_field %w(api protocol), :collection => :api_protocols_for_manila, diff --git a/crowbar_framework/app/views/barclamp/neutron/_edit_attributes.html.haml b/crowbar_framework/app/views/barclamp/neutron/_edit_attributes.html.haml index 708ff41fab..18e57535c9 100644 --- a/crowbar_framework/app/views/barclamp/neutron/_edit_attributes.html.haml +++ b/crowbar_framework/app/views/barclamp/neutron/_edit_attributes.html.haml @@ -164,7 +164,7 @@ %fieldset %legend - = t(".ssl_header") + = t(".tls_header") = select_field %w(api protocol), :collection => :api_protocols_for_neutron, "data-sslprefix" => "ssl", "data-sslcert" => "/etc/neutron/ssl/certs/signing_cert.pem", "data-sslkey" => "/etc/neutron/ssl/private/signing_key.pem" 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 d7750b2447..7920031ea4 100644 --- a/crowbar_framework/app/views/barclamp/nova/_edit_attributes.html.haml +++ b/crowbar_framework/app/views/barclamp/nova/_edit_attributes.html.haml @@ -71,7 +71,7 @@ %fieldset %legend - = t(".ssl_header") + = t(".tls_header") = boolean_field %w(ssl enabled), :collection => :ssl_protocols_for_nova, "data-sslprefix" => "ssl", "data-sslcert" => "/etc/nova/ssl/certs/signing_cert.pem", "data-sslkey" => "/etc/nova/ssl/private/signing_key.pem" diff --git a/crowbar_framework/app/views/barclamp/rabbitmq/_edit_attributes.html.haml b/crowbar_framework/app/views/barclamp/rabbitmq/_edit_attributes.html.haml index 55decbd960..acc6227f3a 100644 --- a/crowbar_framework/app/views/barclamp/rabbitmq/_edit_attributes.html.haml +++ b/crowbar_framework/app/views/barclamp/rabbitmq/_edit_attributes.html.haml @@ -40,7 +40,7 @@ %fieldset %legend - = t(".ssl_header") + = t(".tls_header") = boolean_field %w(ssl enabled), "data-sslprefix" => "ssl", diff --git a/crowbar_framework/config/locales/aodh/en.yml b/crowbar_framework/config/locales/aodh/en.yml index d8a9675697..4480429bdc 100644 --- a/crowbar_framework/config/locales/aodh/en.yml +++ b/crowbar_framework/config/locales/aodh/en.yml @@ -29,13 +29,13 @@ en: api: protocol: 'Protocol' - ssl_header: 'SSL Support' + tls_header: 'TLS (SSL) Support' ssl: generate_certs: 'Generate (self-signed) certificates (implies insecure)' - certfile: 'SSL Certificate File' - keyfile: 'SSL (Private) Key File' - insecure: 'SSL Certificate is insecure (for instance, self-signed)' - cert_required: 'Require Client Certificate' - ca_certs: 'SSL CA Certificates File' + certfile: 'Server X.509 Certificate (Public) File' + keyfile: 'Server X.509 Key (Private) File' + insecure: 'Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' + cert_required: 'Certificate Authority (CA) Bundle File Required' + ca_certs: 'Server CA Certificate Bundle File' validation: evaluation_interval: 'Evaluation interval shall be equal or higher than the interval of meters set in Ceilometer' diff --git a/crowbar_framework/config/locales/barbican/en.yml b/crowbar_framework/config/locales/barbican/en.yml index 6054d04fc5..c8c19f1036 100644 --- a/crowbar_framework/config/locales/barbican/en.yml +++ b/crowbar_framework/config/locales/barbican/en.yml @@ -36,11 +36,11 @@ en: enable_keystone_listener: "Enable Barbican's Keystone listener service" group: 'Group for Barbican services' user: 'User for Barbican services' - ssl_header: 'SSL Support' + tls_header: 'TLS (SSL) Support' ssl: generate_certs: 'Generate (self-signed) certificates (implies insecure)' - certfile: 'SSL Certificate File' - keyfile: 'SSL (Private) Key File' - insecure: 'SSL Certificate is insecure (for instance, self-signed)' - cert_required: 'Require Client Certificate' - ca_certs: 'SSL CA Certificates File' + certfile: 'Server X.509 Certificate (Public) File' + keyfile: 'Server X.509 Key (Private) File' + insecure: 'Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' + cert_required: 'Certificate Authority (CA) Bundle File Required' + ca_certs: 'Server CA Certificate Bundle File' diff --git a/crowbar_framework/config/locales/ceilometer/en.yml b/crowbar_framework/config/locales/ceilometer/en.yml index 803fd0641a..3eec65e96c 100644 --- a/crowbar_framework/config/locales/ceilometer/en.yml +++ b/crowbar_framework/config/locales/ceilometer/en.yml @@ -36,14 +36,14 @@ en: metering_time_to_live_hint: '-1 means that samples are kept in the database forever' event_time_to_live: 'How long are event samples kept in the database (in days)' event_time_to_live_hint: '-1 means that samples are kept in the database forever' - ssl_header: 'SSL Support' + tls_header: 'TLS (SSL) Support' ssl: generate_certs: 'Generate (self-signed) certificates (implies insecure)' - certfile: 'SSL Certificate File' - keyfile: 'SSL (Private) Key File' - insecure: 'SSL Certificate is insecure (for instance, self-signed)' - cert_required: 'Require Client Certificate' - ca_certs: 'SSL CA Certificates File' + certfile: 'Server X.509 Certificate (Public) File' + keyfile: 'Server X.509 Key (Private) File' + insecure: 'Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' + cert_required: 'Certificate Authority (CA) Bundle File Required' + ca_certs: 'Server CA Certificate Bundle File' validation: notifications_enabled: 'Sending notifications has to be enabled in the RabbitMQ proposal first.' hyper_v_support: 'Hyper-V support is not available.' diff --git a/crowbar_framework/config/locales/cinder/en.yml b/crowbar_framework/config/locales/cinder/en.yml index f6b51ca3d3..1f37ee0009 100644 --- a/crowbar_framework/config/locales/cinder/en.yml +++ b/crowbar_framework/config/locales/cinder/en.yml @@ -138,7 +138,7 @@ en: cluster_name: 'vCenter Cluster Names for Volumes' volume_folder: 'Folder for Volumes' ca_file: 'CA file for verifying the vCenter certificate' - insecure: 'vCenter SSL Certificate is insecure (for instance, self-signed)' + insecure: 'vCenter Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' local: file_name: 'Volume File Name' file_size: 'Maximum File Size (GB)' @@ -158,13 +158,13 @@ en: api: protocol: 'Protocol' ssl: - header: 'SSL Support' - insecure: 'SSL Certificate is insecure (for instance, self-signed)' - certfile: 'SSL Certificate File' - keyfile: 'SSL (Private) Key File' + header: 'TLS (SSL) Support' + insecure: 'Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' + certfile: 'Server X.509 Certificate (Public) File' + keyfile: 'Server X.509 Key (Private) File' generate_certs: 'Generate (self-signed) certificates (implies insecure)' - cert_required: 'Require Client Certificate' - ca_certs: 'SSL CA Certificates File' + cert_required: 'Certificate Authority (CA) Bundle File Required' + ca_certs: 'Server CA Certificate Bundle File' validation: invalid_proposal: 'Invalid proposal: backend with driver %{backend_driver} is missing the backend-specific attributes.' volume_name: '%{count} backends are using \"%{volume_name}\" as LVM volume name.' diff --git a/crowbar_framework/config/locales/database/en.yml b/crowbar_framework/config/locales/database/en.yml index a1c6542736..8fbc2f591e 100644 --- a/crowbar_framework/config/locales/database/en.yml +++ b/crowbar_framework/config/locales/database/en.yml @@ -28,14 +28,14 @@ en: max_connections: 'Maximum Number of simultaneous Connections' expire_logs_days: 'Number of days after the binary logs can be automatically removed' slow_query_logging: 'Slow Query Logging' - ssl_header: 'SSL Support' + tls_header: 'TLS (SSL) Support' ssl: enabled: 'Enable SSL' generate_certs: 'Generate (self-signed) certificates (implies insecure)' - certfile: 'SSL Certificate File' - keyfile: 'SSL (Private) Key File' - ca_certs: 'SSL CA Certificates File' - insecure: 'SSL Certificate is insecure (for instance, self-signed)' + certfile: 'Server X.509 Certificate (Public) File' + keyfile: 'Server X.509 Key (Private) File' + ca_certs: 'Server CA Certificate Bundle File' + insecure: 'Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' postgresql_attributes: 'PostgreSQL Options' postgresql: config: diff --git a/crowbar_framework/config/locales/glance/en.yml b/crowbar_framework/config/locales/glance/en.yml index 0d5c57443a..ac77766a97 100644 --- a/crowbar_framework/config/locales/glance/en.yml +++ b/crowbar_framework/config/locales/glance/en.yml @@ -44,17 +44,17 @@ en: datastores: 'Datastores for Storing Images' datastores_hint: 'A comma-separated list of datastores specified in the following format: :' store_image_dir: 'Path on the datastore, where the glance images will be stored' - insecure: 'vCenter SSL Certificate is insecure (for instance, self-signed)' + insecure: 'vCenter Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' api: protocol: 'Protocol' - ssl_header: 'SSL Support' + tls_header: 'TLS (SSL) Support' ssl: generate_certs: 'Generate (self-signed) certificates (implies insecure)' - certfile: 'SSL Certificate File' - keyfile: 'SSL (Private) Key File' - insecure: 'SSL Certificate is insecure (for instance, self-signed)' - cert_required: 'Require Client Certificate' - ca_certs: 'SSL CA Certificates File' + certfile: 'Server X.509 Certificate (Public) File' + keyfile: 'Server X.509 Key (Private) File' + insecure: 'Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' + cert_required: 'Certificate Authority (CA) Bundle File Required' + ca_certs: 'Server CA Certificate Bundle File' cache_header: 'Caching' enable_caching: 'Enable Caching' use_cachemanagement: 'Turn On Cache Management' diff --git a/crowbar_framework/config/locales/heat/en.yml b/crowbar_framework/config/locales/heat/en.yml index 48df002c38..5e79754ff9 100644 --- a/crowbar_framework/config/locales/heat/en.yml +++ b/crowbar_framework/config/locales/heat/en.yml @@ -26,11 +26,11 @@ en: rabbitmq_instance: 'RabbitMQ' api: protocol: 'Protocol' - ssl_header: 'SSL Support' + tls_header: 'TLS (SSL) Support' ssl: generate_certs: 'Generate (self-signed) certificates (implies insecure)' - certfile: 'SSL Certificate File' - keyfile: 'SSL (Private) Key File' - insecure: 'SSL Certificate is insecure (for instance, self-signed)' - cert_required: 'Require Client Certificate' - ca_certs: 'SSL CA Certificates File' + certfile: 'Server X.509 Certificate (Public) File' + keyfile: 'Server X.509 Key (Private) File' + insecure: 'Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' + cert_required: 'Certificate Authority (CA) Bundle File Required' + ca_certs: 'Server CA Certificate Bundle File' diff --git a/crowbar_framework/config/locales/horizon/en.yml b/crowbar_framework/config/locales/horizon/en.yml index 04ee351c3c..5d59b55c2d 100644 --- a/crowbar_framework/config/locales/horizon/en.yml +++ b/crowbar_framework/config/locales/horizon/en.yml @@ -26,13 +26,13 @@ en: password_validator: regex: 'Regular expression used for password validation' help_text: 'Text to display if the password does not pass validation' - ssl_header: 'SSL Support' + tls_header: 'TLS (SSL) Support' session_timeout: 'Session Timeout (in minutes)' apache: ssl: 'Protocol' generate_certs: 'Generate (self-signed) certificates' - ssl_crt_file: 'SSL Certificate File' - ssl_key_file: 'SSL (Private) Key File' + ssl_crt_file: 'Server X.509 Certificate (Public) File' + ssl_key_file: 'Server X.509 Key (Private) File' ssl_crt_chain_file: 'SSL Certificate Chain File' validation: enable_keystone: 'Multi domain support requires enabling Keystone V3 API in the keystone proposal first.' diff --git a/crowbar_framework/config/locales/ironic/en.yml b/crowbar_framework/config/locales/ironic/en.yml index 7237e399de..7d9970cda1 100644 --- a/crowbar_framework/config/locales/ironic/en.yml +++ b/crowbar_framework/config/locales/ironic/en.yml @@ -29,7 +29,7 @@ en: automated_clean: 'Enable automated node cleaning' api: protocol: 'Protocol' - ssl_header: 'SSL Support' + tls_header: 'TLS (SSL) Support' validation: ironic_network: 'Ironic network is not configured.' swift_proposal: 'To use agent_* drivers, Swift needs to be enabled.' diff --git a/crowbar_framework/config/locales/keystone/en.yml b/crowbar_framework/config/locales/keystone/en.yml index 940148fb18..351951cca6 100644 --- a/crowbar_framework/config/locales/keystone/en.yml +++ b/crowbar_framework/config/locales/keystone/en.yml @@ -30,16 +30,16 @@ en: admin: username: 'Administrator Username' password: 'Administrator Password' - ssl_header: 'SSL Support' + tls_header: 'TLS (SSL) Support' api: protocol: 'Protocol' region: 'Region name' ssl: generate_certs: 'Generate (self-signed) certificates (implies insecure)' - certfile: 'SSL Certificate File' - keyfile: 'SSL (Private) Key File' - insecure: 'SSL Certificate is insecure (for instance, self-signed)' - ca_certs: 'SSL CA Certificates File' + certfile: 'Server X.509 Certificate (Public) File' + keyfile: 'Server X.509 Key (Private) File' + insecure: 'Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' + ca_certs: 'Server CA Certificate Bundle File' validation: api_version: 'API version %{api_version} not recognized.' enable_keystone_api: 'Keystone API version 3 needs to be enabled in order to use domain specific drivers.' diff --git a/crowbar_framework/config/locales/manila/en.yml b/crowbar_framework/config/locales/manila/en.yml index df5714314c..4817447173 100644 --- a/crowbar_framework/config/locales/manila/en.yml +++ b/crowbar_framework/config/locales/manila/en.yml @@ -79,14 +79,14 @@ en: manual: config: 'Options' driver: 'Driver' - ssl_header: 'SSL Support' + tls_header: 'TLS (SSL) Support' ssl: generate_certs: 'Generate (self-signed) certificates (implies insecure)' - certfile: 'SSL Certificate File' - keyfile: 'SSL (Private) Key File' - insecure: 'SSL Certificate is insecure (for instance, self-signed)' - cert_required: 'Require Client Certificate' - ca_certs: 'SSL CA Certificates File' + certfile: 'Server X.509 Certificate (Public) File' + keyfile: 'Server X.509 Key (Private) File' + insecure: 'Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' + cert_required: 'Certificate Authority (CA) Bundle File Required' + ca_certs: 'Server CA Certificate Bundle File' api: protocol: 'Protocol' validation: diff --git a/crowbar_framework/config/locales/neutron/en.yml b/crowbar_framework/config/locales/neutron/en.yml index 822323bae0..e5d67761dd 100644 --- a/crowbar_framework/config/locales/neutron/en.yml +++ b/crowbar_framework/config/locales/neutron/en.yml @@ -93,16 +93,16 @@ en: zvm_physnet_rdev: 'rdev list for physnet1 vswitch uplink (if available)' xcat_mgt_ip: 'xCAT IP Address on Management Network' xcat_mgt_mask: 'Net Mask of Management Network' - ssl_header: 'SSL Support' + tls_header: 'TLS (SSL) Support' api: protocol: 'Protocol' ssl: generate_certs: 'Generate (self-signed) certificates (implies insecure)' - certfile: 'SSL Certificate File' - keyfile: 'SSL (Private) Key File' - insecure: 'SSL Certificate is insecure (for instance, self-signed)' - cert_required: 'Require Client Certificate' - ca_certs: 'SSL CA Certificates File' + certfile: 'Server X.509 Certificate (Public) File' + keyfile: 'Server X.509 Key (Private) File' + insecure: 'Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' + cert_required: 'Certificate Authority (CA) Bundle File Required' + ca_certs: 'Server CA Certificate Bundle File' no_switches: 'Currently there are no switches assigned' error_invalid: 'IP Address, Port, Username and Password must not be empty!' error_duplicate: 'There is already a Switch configuration for that IP Address!' diff --git a/crowbar_framework/config/locales/nova/en.yml b/crowbar_framework/config/locales/nova/en.yml index 422c5a8160..615ce6c0de 100644 --- a/crowbar_framework/config/locales/nova/en.yml +++ b/crowbar_framework/config/locales/nova/en.yml @@ -49,7 +49,7 @@ en: datastore: 'Regular Expression to match the name of a datastore' interface: 'VLAN Interface' ca_file: 'CA file for verifying the vCenter certificate' - insecure: 'vCenter SSL Certificate is insecure (for instance, self-signed)' + insecure: 'vCenter Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' vnc_keymap: 'Keymap' vmware_cluster_hint: 'A comma-separated list of cluster names' zvm_header: 'z/VM Configuration' @@ -64,33 +64,33 @@ en: zvm_user_profile: 'User profile for creating a z/VM userid' zvm_xcat_master: 'The xCAT MN node name' zvm_xcat_ssh_key: 'The xCAT MN node public SSH key' - ssl_header: 'SSL Support' + tls_header: 'TLS (SSL) Support' ssl: enabled: 'Protocol' - insecure: 'SSL Certificate is insecure (for instance, self-signed)' - certfile: 'SSL Certificate File' - keyfile: 'SSL (Private) Key File' + insecure: 'Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' + certfile: 'Server X.509 Certificate (Public) File' + keyfile: 'Server X.509 Key (Private) File' generate_certs: 'Generate (self-signed) certificates (implies insecure)' - cert_required: 'Require Client Certificate' - ca_certs: 'SSL CA Certificates File' + cert_required: 'Certificate Authority (CA) Bundle File Required' + ca_certs: 'Server CA Certificate Bundle File' vnc_header: 'VNC Settings' novnc_ssl_hint: 'If no specific files are configured, the SSL certificate and key will be taken from the global Nova SSL configuration.' novnc: ssl: enabled: 'NoVNC Protocol' - certfile: 'SSL Certificate File' - keyfile: 'SSL (Private) Key File' + certfile: 'Server X.509 Certificate (Public) File' + keyfile: 'Server X.509 Key (Private) File' ec2-api_header: 'EC2API Configuration' ec2-api: - ssl_header: 'SSL Support' + tls_header: 'TLS (SSL) Support' ssl: enabled: 'Protocol' - insecure: 'SSL Certificate is insecure (for instance, self-signed)' - certfile: 'SSL Certificate File' - keyfile: 'SSL (Private) Key File' + insecure: 'Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' + certfile: 'Server X.509 Certificate (Public) File' + keyfile: 'Server X.509 Key (Private) File' generate_certs: 'Generate (self-signed) certificates (implies insecure)' - cert_required: 'Require Client Certificate' - ca_certs: 'SSL CA Certificates File' + cert_required: 'Certificate Authority (CA) Bundle File Required' + ca_certs: 'Server CA Certificate Bundle File' validation: no_shared_storage_cluster: 'Shared storage cannot be automatically setup when a cluster has the nova-controller role. Please consider using the NFS Client barclamp instead.' setup_use_shared_storage: 'When automatically setting up shared storage, it must also be used.' diff --git a/crowbar_framework/config/locales/rabbitmq/en.yml b/crowbar_framework/config/locales/rabbitmq/en.yml index 577ded71ae..7ef4e38d10 100644 --- a/crowbar_framework/config/locales/rabbitmq/en.yml +++ b/crowbar_framework/config/locales/rabbitmq/en.yml @@ -34,16 +34,16 @@ en: record_remove: 'Delete' no_records: 'No records' port: 'Port' - ssl_header: 'SSL Support' + tls_header: 'TLS (SSL) Support' ssl: enabled: 'Enable SSL' port: 'SSL Port' generate_certs: 'Generate (self-signed) certificates (implies insecure)' - certfile: 'SSL Certificate File' - keyfile: 'SSL (Private) Key File' - insecure: 'SSL Certificate is insecure (for instance, self-signed)' - cert_required: 'Require Client Certificate' - ca_certs: 'SSL CA Certificates File' + certfile: 'Server X.509 Certificate (Public) File' + keyfile: 'Server X.509 Key (Private) File' + insecure: 'Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' + cert_required: 'Certificate Authority (CA) Bundle File Required' + ca_certs: 'Server CA Certificate Bundle File' client_ca_certs: 'SSL client CA file (used to validate rabbitmq server certificate)' validation: no_new_unclustered: 'HA without RabbitMQ clustering is not allowed for new deployments.' diff --git a/crowbar_framework/config/locales/swift/en.yml b/crowbar_framework/config/locales/swift/en.yml index abd96aef4e..4422a9f9c3 100644 --- a/crowbar_framework/config/locales/swift/en.yml +++ b/crowbar_framework/config/locales/swift/en.yml @@ -115,12 +115,12 @@ en: account_blacklist: 'Account blacklist' container_ratelimit_size: 'Container ratelimit size' ssl: - header: 'SSL Support' + header: 'TLS (SSL) Support' enabled: 'Protocol' - certfile: 'SSL Certificate File' - keyfile: 'SSL (Private) Key File' + certfile: 'Server X.509 Certificate (Public) File' + keyfile: 'Server X.509 Key (Private) File' generate_certs: 'Generate (self-signed) certificates (implies insecure)' - insecure: 'SSL Certificate is insecure (for instance, self-signed)' + insecure: 'Skip Certificate Validation (self-signed/insecure) (for instance, self-signed)' validation: radosgw: 'Ceph with RadosGW support is already deployed. Only one of Ceph with RadosGW and Swift can be deployed at any time.' replica: 'Need at least 1 replica.'