openstack: Rename SSL options to TLS

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,

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,

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,

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"

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"
 

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,

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,

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

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,

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,

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"
 

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"
 

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",

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'

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'

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.'

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.'

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:

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: <datacenter_name>:<datastore_name>'
           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'

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'

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.'

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.'

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.'

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:

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!'