openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Replace enabled languages with excluded languages in UI"

This commit is contained in:
Jenkins 2017-08-16 00:39:17 +00:00 committed by Gerrit Code Review
parent 4d20d1099d b59d7e7725
commit c82a5fe7e0
2 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
manifests/ui.pp
View File

@ -31,19 +31,9 @@
# The port on which the UI is listening.
# Defaults to 3000
#
# [*enabled_languages*]
# Which languages to show in the UI.
# A hash.
# Defaults to
# {
# 'de' => 'German',
# 'en' => 'English',
# 'es' => 'Spanish',
# 'id' => 'Indonesian',
# 'ja' => 'Japanese',
# 'ko-KR' => 'Korean',
# 'zh-CN' => 'Simplified Chinese'
# }
# [*excluded_languages*]
# A list of languages that shouldn't be enabled in the UI, e.g. ['en', 'de']
# Defaults to []
#
# [*endpoint_proxy_keystone*]
# The keystone proxy endpoint url
@ -107,19 +97,11 @@
# Defaults to 'tripleo'
#
class tripleo::ui (
$servername = $::fqdn,
$bind_host = hiera('controller_host'),
$ui_port = 3000,
$zaqar_default_queue = 'tripleo',
$enabled_languages = {
'de' => 'German',
'en' => 'English',
'es' => 'Spanish',
'id' => 'Indonesian',
'ja' => 'Japanese',
'ko-KR' => 'Korean',
'zh-CN' => 'Simplified Chinese'
},
$servername = $::fqdn,
$bind_host = hiera('controller_host'),
$ui_port = 3000,
$zaqar_default_queue = 'tripleo',
$excluded_languages = [],
$endpoint_proxy_zaqar = undef,
$endpoint_proxy_keystone = undef,
$endpoint_proxy_heat = undef,

10
templates/ui/tripleo_ui_config.js.erb
View File

@ -16,10 +16,12 @@ window.tripleOUiConfig = {
'zaqar_default_queue': '<%= @zaqar_default_queue %>',
// Languages
// If you choose more than one language, a language switcher will appear in
// the navigation bar.
// Only 'en' (English) is enabled by default.
'languages': <%= @enabled_languages.to_json %>,
//
// By default, all available languages are enabled. Use this setting to
// disable certain languages.
//
'excludedLanguages': <%= @excluded_languages.to_json %>,
// Logging
// 'loggers': ['console']