From: Honza Pokorny <honza@redhat.com>
Date: Mon, 11 Sep 2017 17:53:41 +0000 (-0300)
Subject: Add a new configuration option for GUI loggers
X-Git-Tag: opnfv-6.0.0~26
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=fb0f290777c2f17ebd1d558805be06fe65f1c331;p=apex-puppet-tripleo.git

Add a new configuration option for GUI loggers

This allows us to set up logging for the TripleO GUI.  By default, it enables
the 'console' and 'zaqar' loggers.

Change-Id: Iafc874643c29e63ff670831fe80f6601c3051865
Closes-Bug: #1716458
(cherry picked from commit 5158c7ab1669d9d3e8c8163be9fdfc9b3a3aea96)
---

diff --git a/manifests/ui.pp b/manifests/ui.pp
index cb1da21..3caaf9b 100644
--- a/manifests/ui.pp
+++ b/manifests/ui.pp
@@ -96,6 +96,10 @@
 #  A string.
 #  Defaults to 'tripleo'
 #
+# [*enabled_loggers*]
+#  List of enabled loggers
+#  Defaults to ['console', 'zaqar']
+#
 class tripleo::ui (
   $servername                       = $::fqdn,
   $bind_host                        = hiera('controller_host'),
@@ -116,6 +120,7 @@ class tripleo::ui (
   $endpoint_config_ironic_inspector = undef,
   $endpoint_config_mistral          = undef,
   $endpoint_config_swift            = undef,
+  $enabled_loggers                  = ['console', 'zaqar'],
 
 ) {
   package {'openstack-tripleo-ui': }
diff --git a/templates/ui/tripleo_ui_config.js.erb b/templates/ui/tripleo_ui_config.js.erb
index 613042b..10e7279 100644
--- a/templates/ui/tripleo_ui_config.js.erb
+++ b/templates/ui/tripleo_ui_config.js.erb
@@ -22,7 +22,6 @@ window.tripleOUiConfig = {
   //
   'excludedLanguages': <%= @excluded_languages.to_json %>,
 
-
   // Logging
-  // 'loggers': ['console']
+  'loggers': <%= @enabled_loggers.to_json %>
 };