Merge "Add configuration option to disable top level menu for javamelody plugin"

modules/gerrit/manifests/init.pp

@@ -151,6 +151,7 @@ class gerrit(
   $testmode = false,
   $secondary_index = false,
   $secondary_index_type = 'LUCENE',
+  $enable_javamelody_top_menu = false,
 ) {
   include apache
   include jeepyb

modules/gerrit/templates/gerrit.config.erb

@@ -101,6 +101,8 @@
 [melody]
 	monitoring = <%= enable_melody %>
 	session = <%= melody_session %>
+[plugin "javamelody"]
+        allowTopMenu = <%= enable_javamelody_top_menu %>
 <% if gitweb or cgit -%>
 [gitweb]
 <% if gitweb -%>

modules/openstack_project/manifests/gerrit.pp

@@ -108,6 +108,7 @@ class openstack_project::gerrit (
     enable_melody                       => true,
     melody_session                      => true,
     robots_txt_source                   => 'puppet:///modules/openstack_project/gerrit/robots.txt',
+    enable_javamelody_top_menu          => false,
     # passthrough
     ssl_cert_file                       => $ssl_cert_file,
     ssl_key_file                        => $ssl_key_file,