Browse Source

Set server admin var so that vhost works

Using the puppet 4 future parser it is far more particular about
variables and their scoping. We don't set a serveradmin in this class
but then attempt to use it in the vhost template. This was fine under
puppet 3 as it would just look for this out of the current scope but
breaks under puppet 4.

Make this trivially happy on puppet 4 by setting a default that is sane.

Change-Id: Id415056cdfa693fd199e0b4a0c6b09e20faf23ef
changes/44/625344/1
Clark Boylan 8 months ago
parent
commit
c6e070db6c
1 changed files with 1 additions and 0 deletions
  1. 1
    0
      manifests/js.pp

+ 1
- 0
manifests/js.pp View File

@@ -23,6 +23,7 @@ class kibana::js (
23 23
   $vhost_proxy_connect_timeout = '15',
24 24
   $vhost_proxy_timeout         = '120',
25 25
   $vhost_template              = 'kibana/dual-elasticsearch.vhost.erb',
26
+  $serveradmin                 = "webmaster@${::fqdn}",
26 27
 ) {
27 28
 
28 29
   $base_path = "/opt/kibana/${git_revision}"

Loading…
Cancel
Save